diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + + style="@style/tagTextViewStyle" + android:text="商\u3000\u3000户" /> - + + style="@style/tagTextViewStyle" + android:text="店\u3000\u3000主" /> + android:background="@null" + android:hint="请输入店主姓名" + android:padding="3dp" /> @@ -86,49 +78,39 @@ + style="@style/tagTextViewStyle" + android:text="电话号码" /> + android:padding="3dp" /> - + style="@style/tagTextViewStyle" + android:text="案卷情况" /> + android:padding="3dp" /> @@ -153,7 +135,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + + style="@style/tagTextViewStyle" + android:text="商\u3000\u3000户" /> - + + style="@style/tagTextViewStyle" + android:text="店\u3000\u3000主" /> + android:background="@null" + android:hint="请输入店主姓名" + android:padding="3dp" /> @@ -86,49 +78,39 @@ + style="@style/tagTextViewStyle" + android:text="电话号码" /> + android:padding="3dp" /> - + style="@style/tagTextViewStyle" + android:text="案卷情况" /> + android:padding="3dp" /> @@ -153,7 +135,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 19496ef..604d9d6 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:padding="5dp" + android:singleLine="true" /> @@ -70,19 +63,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="密码确认" - android:textColor="@color/black" android:textSize="@dimen/textFontSize" /> + android:padding="5dp" + android:singleLine="true" /> diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + + style="@style/tagTextViewStyle" + android:text="商\u3000\u3000户" /> - + + style="@style/tagTextViewStyle" + android:text="店\u3000\u3000主" /> + android:background="@null" + android:hint="请输入店主姓名" + android:padding="3dp" /> @@ -86,49 +78,39 @@ + style="@style/tagTextViewStyle" + android:text="电话号码" /> + android:padding="3dp" /> - + style="@style/tagTextViewStyle" + android:text="案卷情况" /> + android:padding="3dp" /> @@ -153,7 +135,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 19496ef..604d9d6 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:padding="5dp" + android:singleLine="true" /> @@ -70,19 +63,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="密码确认" - android:textColor="@color/black" android:textSize="@dimen/textFontSize" /> + android:padding="5dp" + android:singleLine="true" /> diff --git a/app/src/main/res/layout/activity_three_package.xml b/app/src/main/res/layout/activity_three_package.xml index 543be6e..a5ffbe8 100644 --- a/app/src/main/res/layout/activity_three_package.xml +++ b/app/src/main/res/layout/activity_three_package.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + + style="@style/tagTextViewStyle" + android:text="商\u3000\u3000户" /> - + + style="@style/tagTextViewStyle" + android:text="店\u3000\u3000主" /> + android:background="@null" + android:hint="请输入店主姓名" + android:padding="3dp" /> @@ -86,49 +78,39 @@ + style="@style/tagTextViewStyle" + android:text="电话号码" /> + android:padding="3dp" /> - + style="@style/tagTextViewStyle" + android:text="案卷情况" /> + android:padding="3dp" /> @@ -153,7 +135,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 19496ef..604d9d6 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:padding="5dp" + android:singleLine="true" /> @@ -70,19 +63,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="密码确认" - android:textColor="@color/black" android:textSize="@dimen/textFontSize" /> + android:padding="5dp" + android:singleLine="true" /> diff --git a/app/src/main/res/layout/activity_three_package.xml b/app/src/main/res/layout/activity_three_package.xml index 543be6e..a5ffbe8 100644 --- a/app/src/main/res/layout/activity_three_package.xml +++ b/app/src/main/res/layout/activity_three_package.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + + style="@style/tagTextViewStyle" + android:text="商\u3000\u3000户" /> - + + style="@style/tagTextViewStyle" + android:text="店\u3000\u3000主" /> + android:background="@null" + android:hint="请输入店主姓名" + android:padding="3dp" /> @@ -86,49 +78,39 @@ + style="@style/tagTextViewStyle" + android:text="电话号码" /> + android:padding="3dp" /> - + style="@style/tagTextViewStyle" + android:text="案卷情况" /> + android:padding="3dp" /> @@ -153,7 +135,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 19496ef..604d9d6 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:padding="5dp" + android:singleLine="true" /> @@ -70,19 +63,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="密码确认" - android:textColor="@color/black" android:textSize="@dimen/textFontSize" /> + android:padding="5dp" + android:singleLine="true" /> diff --git a/app/src/main/res/layout/activity_three_package.xml b/app/src/main/res/layout/activity_three_package.xml index 543be6e..a5ffbe8 100644 --- a/app/src/main/res/layout/activity_three_package.xml +++ b/app/src/main/res/layout/activity_three_package.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + + style="@style/tagTextViewStyle" + android:text="商\u3000\u3000户" /> - + + style="@style/tagTextViewStyle" + android:text="店\u3000\u3000主" /> + android:background="@null" + android:hint="请输入店主姓名" + android:padding="3dp" /> @@ -86,49 +78,39 @@ + style="@style/tagTextViewStyle" + android:text="电话号码" /> + android:padding="3dp" /> - + style="@style/tagTextViewStyle" + android:text="案卷情况" /> + android:padding="3dp" /> @@ -153,7 +135,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 19496ef..604d9d6 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:padding="5dp" + android:singleLine="true" /> @@ -70,19 +63,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="密码确认" - android:textColor="@color/black" android:textSize="@dimen/textFontSize" /> + android:padding="5dp" + android:singleLine="true" /> diff --git a/app/src/main/res/layout/activity_three_package.xml b/app/src/main/res/layout/activity_three_package.xml index 543be6e..a5ffbe8 100644 --- a/app/src/main/res/layout/activity_three_package.xml +++ b/app/src/main/res/layout/activity_three_package.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + + style="@style/tagTextViewStyle" + android:text="商\u3000\u3000户" /> - + + style="@style/tagTextViewStyle" + android:text="店\u3000\u3000主" /> + android:background="@null" + android:hint="请输入店主姓名" + android:padding="3dp" /> @@ -86,49 +78,39 @@ + style="@style/tagTextViewStyle" + android:text="电话号码" /> + android:padding="3dp" /> - + style="@style/tagTextViewStyle" + android:text="案卷情况" /> + android:padding="3dp" /> @@ -153,7 +135,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 19496ef..604d9d6 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:padding="5dp" + android:singleLine="true" /> @@ -70,19 +63,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="密码确认" - android:textColor="@color/black" android:textSize="@dimen/textFontSize" /> + android:padding="5dp" + android:singleLine="true" /> diff --git a/app/src/main/res/layout/activity_three_package.xml b/app/src/main/res/layout/activity_three_package.xml index 543be6e..a5ffbe8 100644 --- a/app/src/main/res/layout/activity_three_package.xml +++ b/app/src/main/res/layout/activity_three_package.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="案卷编号" /> @@ -32,23 +28,14 @@ + style="@style/tagTextViewStyle" + android:text="案卷类型" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷大类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷小类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="社\u3000\u3000区" /> @@ -146,24 +111,17 @@ + style="@style/tagTextViewStyle" + android:text="案卷地点" /> + android:background="@null" + android:padding="5dp" /> + style="@style/tagTextViewStyle" + android:text="案卷情况" /> diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + + style="@style/tagTextViewStyle" + android:text="商\u3000\u3000户" /> - + + style="@style/tagTextViewStyle" + android:text="店\u3000\u3000主" /> + android:background="@null" + android:hint="请输入店主姓名" + android:padding="3dp" /> @@ -86,49 +78,39 @@ + style="@style/tagTextViewStyle" + android:text="电话号码" /> + android:padding="3dp" /> - + style="@style/tagTextViewStyle" + android:text="案卷情况" /> + android:padding="3dp" /> @@ -153,7 +135,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 19496ef..604d9d6 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:padding="5dp" + android:singleLine="true" /> @@ -70,19 +63,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="密码确认" - android:textColor="@color/black" android:textSize="@dimen/textFontSize" /> + android:padding="5dp" + android:singleLine="true" /> diff --git a/app/src/main/res/layout/activity_three_package.xml b/app/src/main/res/layout/activity_three_package.xml index 543be6e..a5ffbe8 100644 --- a/app/src/main/res/layout/activity_three_package.xml +++ b/app/src/main/res/layout/activity_three_package.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="案卷编号" /> @@ -32,23 +28,14 @@ + style="@style/tagTextViewStyle" + android:text="案卷类型" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷大类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷小类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="社\u3000\u3000区" /> @@ -146,24 +111,17 @@ + style="@style/tagTextViewStyle" + android:text="案卷地点" /> + android:background="@null" + android:padding="5dp" /> + style="@style/tagTextViewStyle" + android:text="案卷情况" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index c32fde3..f657098 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -9,16 +9,15 @@ @@ -29,16 +28,15 @@ @@ -55,10 +53,10 @@ @@ -75,10 +73,10 @@ @@ -94,10 +92,10 @@ @@ -106,7 +104,6 @@ @@ -171,10 +163,10 @@ diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + + style="@style/tagTextViewStyle" + android:text="商\u3000\u3000户" /> - + + style="@style/tagTextViewStyle" + android:text="店\u3000\u3000主" /> + android:background="@null" + android:hint="请输入店主姓名" + android:padding="3dp" /> @@ -86,49 +78,39 @@ + style="@style/tagTextViewStyle" + android:text="电话号码" /> + android:padding="3dp" /> - + style="@style/tagTextViewStyle" + android:text="案卷情况" /> + android:padding="3dp" /> @@ -153,7 +135,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 19496ef..604d9d6 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:padding="5dp" + android:singleLine="true" /> @@ -70,19 +63,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="密码确认" - android:textColor="@color/black" android:textSize="@dimen/textFontSize" /> + android:padding="5dp" + android:singleLine="true" /> diff --git a/app/src/main/res/layout/activity_three_package.xml b/app/src/main/res/layout/activity_three_package.xml index 543be6e..a5ffbe8 100644 --- a/app/src/main/res/layout/activity_three_package.xml +++ b/app/src/main/res/layout/activity_three_package.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="案卷编号" /> @@ -32,23 +28,14 @@ + style="@style/tagTextViewStyle" + android:text="案卷类型" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷大类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷小类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="社\u3000\u3000区" /> @@ -146,24 +111,17 @@ + style="@style/tagTextViewStyle" + android:text="案卷地点" /> + android:background="@null" + android:padding="5dp" /> + style="@style/tagTextViewStyle" + android:text="案卷情况" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index c32fde3..f657098 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -9,16 +9,15 @@ @@ -29,16 +28,15 @@ @@ -55,10 +53,10 @@ @@ -75,10 +73,10 @@ @@ -94,10 +92,10 @@ @@ -106,7 +104,6 @@ @@ -171,10 +163,10 @@ diff --git a/app/src/main/res/layout/include_case_location.xml b/app/src/main/res/layout/include_case_location.xml index f347c75..c461f0d 100644 --- a/app/src/main/res/layout/include_case_location.xml +++ b/app/src/main/res/layout/include_case_location.xml @@ -26,6 +26,7 @@ android:layout_marginEnd="@dimen/margin_10dp" android:layout_toStartOf="@id/locationMapView" android:paddingHorizontal="3dp" + android:textColor="@color/textColor" android:textSize="@dimen/textFontSize" /> @@ -78,9 +80,12 @@ android:layout_height="wrap_content" android:layout_marginStart="100dp" android:layout_marginEnd="10dp" - android:background="@drawable/bg_layout" - android:paddingHorizontal="3dp" - android:paddingVertical="5dp" /> + android:background="@null" + android:hint="社区通过地图选点获取" + android:padding="3dp" + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> @@ -97,14 +102,13 @@ + android:padding="3dp" /> \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + + style="@style/tagTextViewStyle" + android:text="商\u3000\u3000户" /> - + + style="@style/tagTextViewStyle" + android:text="店\u3000\u3000主" /> + android:background="@null" + android:hint="请输入店主姓名" + android:padding="3dp" /> @@ -86,49 +78,39 @@ + style="@style/tagTextViewStyle" + android:text="电话号码" /> + android:padding="3dp" /> - + style="@style/tagTextViewStyle" + android:text="案卷情况" /> + android:padding="3dp" /> @@ -153,7 +135,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 19496ef..604d9d6 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:padding="5dp" + android:singleLine="true" /> @@ -70,19 +63,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="密码确认" - android:textColor="@color/black" android:textSize="@dimen/textFontSize" /> + android:padding="5dp" + android:singleLine="true" /> diff --git a/app/src/main/res/layout/activity_three_package.xml b/app/src/main/res/layout/activity_three_package.xml index 543be6e..a5ffbe8 100644 --- a/app/src/main/res/layout/activity_three_package.xml +++ b/app/src/main/res/layout/activity_three_package.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="案卷编号" /> @@ -32,23 +28,14 @@ + style="@style/tagTextViewStyle" + android:text="案卷类型" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷大类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷小类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="社\u3000\u3000区" /> @@ -146,24 +111,17 @@ + style="@style/tagTextViewStyle" + android:text="案卷地点" /> + android:background="@null" + android:padding="5dp" /> + style="@style/tagTextViewStyle" + android:text="案卷情况" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index c32fde3..f657098 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -9,16 +9,15 @@ @@ -29,16 +28,15 @@ @@ -55,10 +53,10 @@ @@ -75,10 +73,10 @@ @@ -94,10 +92,10 @@ @@ -106,7 +104,6 @@ @@ -171,10 +163,10 @@ diff --git a/app/src/main/res/layout/include_case_location.xml b/app/src/main/res/layout/include_case_location.xml index f347c75..c461f0d 100644 --- a/app/src/main/res/layout/include_case_location.xml +++ b/app/src/main/res/layout/include_case_location.xml @@ -26,6 +26,7 @@ android:layout_marginEnd="@dimen/margin_10dp" android:layout_toStartOf="@id/locationMapView" android:paddingHorizontal="3dp" + android:textColor="@color/textColor" android:textSize="@dimen/textFontSize" /> @@ -78,9 +80,12 @@ android:layout_height="wrap_content" android:layout_marginStart="100dp" android:layout_marginEnd="10dp" - android:background="@drawable/bg_layout" - android:paddingHorizontal="3dp" - android:paddingVertical="5dp" /> + android:background="@null" + android:hint="社区通过地图选点获取" + android:padding="3dp" + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> @@ -97,14 +102,13 @@ + android:padding="3dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_type.xml b/app/src/main/res/layout/include_case_type.xml index 7ef6b28..a649ee0 100644 --- a/app/src/main/res/layout/include_case_type.xml +++ b/app/src/main/res/layout/include_case_type.xml @@ -12,22 +12,14 @@ style="@style/itemLayoutStyle"> + style="@style/tagTextViewStyle" + android:text="案卷类型" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷大类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷小类" /> + android:hint="请选择" /> imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + + style="@style/tagTextViewStyle" + android:text="商\u3000\u3000户" /> - + + style="@style/tagTextViewStyle" + android:text="店\u3000\u3000主" /> + android:background="@null" + android:hint="请输入店主姓名" + android:padding="3dp" /> @@ -86,49 +78,39 @@ + style="@style/tagTextViewStyle" + android:text="电话号码" /> + android:padding="3dp" /> - + style="@style/tagTextViewStyle" + android:text="案卷情况" /> + android:padding="3dp" /> @@ -153,7 +135,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 19496ef..604d9d6 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:padding="5dp" + android:singleLine="true" /> @@ -70,19 +63,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="密码确认" - android:textColor="@color/black" android:textSize="@dimen/textFontSize" /> + android:padding="5dp" + android:singleLine="true" /> diff --git a/app/src/main/res/layout/activity_three_package.xml b/app/src/main/res/layout/activity_three_package.xml index 543be6e..a5ffbe8 100644 --- a/app/src/main/res/layout/activity_three_package.xml +++ b/app/src/main/res/layout/activity_three_package.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="案卷编号" /> @@ -32,23 +28,14 @@ + style="@style/tagTextViewStyle" + android:text="案卷类型" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷大类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷小类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="社\u3000\u3000区" /> @@ -146,24 +111,17 @@ + style="@style/tagTextViewStyle" + android:text="案卷地点" /> + android:background="@null" + android:padding="5dp" /> + style="@style/tagTextViewStyle" + android:text="案卷情况" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index c32fde3..f657098 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -9,16 +9,15 @@ @@ -29,16 +28,15 @@ @@ -55,10 +53,10 @@ @@ -75,10 +73,10 @@ @@ -94,10 +92,10 @@ @@ -106,7 +104,6 @@ @@ -171,10 +163,10 @@ diff --git a/app/src/main/res/layout/include_case_location.xml b/app/src/main/res/layout/include_case_location.xml index f347c75..c461f0d 100644 --- a/app/src/main/res/layout/include_case_location.xml +++ b/app/src/main/res/layout/include_case_location.xml @@ -26,6 +26,7 @@ android:layout_marginEnd="@dimen/margin_10dp" android:layout_toStartOf="@id/locationMapView" android:paddingHorizontal="3dp" + android:textColor="@color/textColor" android:textSize="@dimen/textFontSize" /> @@ -78,9 +80,12 @@ android:layout_height="wrap_content" android:layout_marginStart="100dp" android:layout_marginEnd="10dp" - android:background="@drawable/bg_layout" - android:paddingHorizontal="3dp" - android:paddingVertical="5dp" /> + android:background="@null" + android:hint="社区通过地图选点获取" + android:padding="3dp" + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> @@ -97,14 +102,13 @@ + android:padding="3dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_type.xml b/app/src/main/res/layout/include_case_type.xml index 7ef6b28..a649ee0 100644 --- a/app/src/main/res/layout/include_case_type.xml +++ b/app/src/main/res/layout/include_case_type.xml @@ -12,22 +12,14 @@ style="@style/itemLayoutStyle"> + style="@style/tagTextViewStyle" + android:text="案卷类型" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷大类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷小类" /> + android:hint="请选择" /> + \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + + style="@style/tagTextViewStyle" + android:text="商\u3000\u3000户" /> - + + style="@style/tagTextViewStyle" + android:text="店\u3000\u3000主" /> + android:background="@null" + android:hint="请输入店主姓名" + android:padding="3dp" /> @@ -86,49 +78,39 @@ + style="@style/tagTextViewStyle" + android:text="电话号码" /> + android:padding="3dp" /> - + style="@style/tagTextViewStyle" + android:text="案卷情况" /> + android:padding="3dp" /> @@ -153,7 +135,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 19496ef..604d9d6 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:padding="5dp" + android:singleLine="true" /> @@ -70,19 +63,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="密码确认" - android:textColor="@color/black" android:textSize="@dimen/textFontSize" /> + android:padding="5dp" + android:singleLine="true" /> diff --git a/app/src/main/res/layout/activity_three_package.xml b/app/src/main/res/layout/activity_three_package.xml index 543be6e..a5ffbe8 100644 --- a/app/src/main/res/layout/activity_three_package.xml +++ b/app/src/main/res/layout/activity_three_package.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="案卷编号" /> @@ -32,23 +28,14 @@ + style="@style/tagTextViewStyle" + android:text="案卷类型" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷大类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷小类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="社\u3000\u3000区" /> @@ -146,24 +111,17 @@ + style="@style/tagTextViewStyle" + android:text="案卷地点" /> + android:background="@null" + android:padding="5dp" /> + style="@style/tagTextViewStyle" + android:text="案卷情况" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index c32fde3..f657098 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -9,16 +9,15 @@ @@ -29,16 +28,15 @@ @@ -55,10 +53,10 @@ @@ -75,10 +73,10 @@ @@ -94,10 +92,10 @@ @@ -106,7 +104,6 @@ @@ -171,10 +163,10 @@ diff --git a/app/src/main/res/layout/include_case_location.xml b/app/src/main/res/layout/include_case_location.xml index f347c75..c461f0d 100644 --- a/app/src/main/res/layout/include_case_location.xml +++ b/app/src/main/res/layout/include_case_location.xml @@ -26,6 +26,7 @@ android:layout_marginEnd="@dimen/margin_10dp" android:layout_toStartOf="@id/locationMapView" android:paddingHorizontal="3dp" + android:textColor="@color/textColor" android:textSize="@dimen/textFontSize" /> @@ -78,9 +80,12 @@ android:layout_height="wrap_content" android:layout_marginStart="100dp" android:layout_marginEnd="10dp" - android:background="@drawable/bg_layout" - android:paddingHorizontal="3dp" - android:paddingVertical="5dp" /> + android:background="@null" + android:hint="社区通过地图选点获取" + android:padding="3dp" + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> @@ -97,14 +102,13 @@ + android:padding="3dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_type.xml b/app/src/main/res/layout/include_case_type.xml index 7ef6b28..a649ee0 100644 --- a/app/src/main/res/layout/include_case_type.xml +++ b/app/src/main/res/layout/include_case_type.xml @@ -12,22 +12,14 @@ style="@style/itemLayoutStyle"> + style="@style/tagTextViewStyle" + android:text="案卷类型" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷大类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷小类" /> + android:hint="请选择" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/item_notice_list.xml b/app/src/main/res/layout/item_notice_list.xml index 51f92f1..f47ac66 100644 --- a/app/src/main/res/layout/item_notice_list.xml +++ b/app/src/main/res/layout/item_notice_list.xml @@ -17,7 +17,8 @@ android:layout_toStartOf="@id/noticeDateView" android:singleLine="true" android:text="这里是标题" - android:textSize="@dimen/titleFontSize" /> + android:textColor="@color/listMainColor" + android:textSize="@dimen/textFontSize" /> @@ -44,8 +45,7 @@ android:layout_toStartOf="@id/messageTagView" android:singleLine="true" android:text="这里是消息内容这里是消息是息内容这里是消息是息内容这里是消息是消消息内容这是消息内容" - android:textColor="@color/gray" - android:textSize="@dimen/textFontSize" /> + android:textColor="@color/listAuxiliaryColor" /> imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + + style="@style/tagTextViewStyle" + android:text="商\u3000\u3000户" /> - + + style="@style/tagTextViewStyle" + android:text="店\u3000\u3000主" /> + android:background="@null" + android:hint="请输入店主姓名" + android:padding="3dp" /> @@ -86,49 +78,39 @@ + style="@style/tagTextViewStyle" + android:text="电话号码" /> + android:padding="3dp" /> - + style="@style/tagTextViewStyle" + android:text="案卷情况" /> + android:padding="3dp" /> @@ -153,7 +135,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 19496ef..604d9d6 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:padding="5dp" + android:singleLine="true" /> @@ -70,19 +63,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="密码确认" - android:textColor="@color/black" android:textSize="@dimen/textFontSize" /> + android:padding="5dp" + android:singleLine="true" /> diff --git a/app/src/main/res/layout/activity_three_package.xml b/app/src/main/res/layout/activity_three_package.xml index 543be6e..a5ffbe8 100644 --- a/app/src/main/res/layout/activity_three_package.xml +++ b/app/src/main/res/layout/activity_three_package.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="案卷编号" /> @@ -32,23 +28,14 @@ + style="@style/tagTextViewStyle" + android:text="案卷类型" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷大类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷小类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="社\u3000\u3000区" /> @@ -146,24 +111,17 @@ + style="@style/tagTextViewStyle" + android:text="案卷地点" /> + android:background="@null" + android:padding="5dp" /> + style="@style/tagTextViewStyle" + android:text="案卷情况" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index c32fde3..f657098 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -9,16 +9,15 @@ @@ -29,16 +28,15 @@ @@ -55,10 +53,10 @@ @@ -75,10 +73,10 @@ @@ -94,10 +92,10 @@ @@ -106,7 +104,6 @@ @@ -171,10 +163,10 @@ diff --git a/app/src/main/res/layout/include_case_location.xml b/app/src/main/res/layout/include_case_location.xml index f347c75..c461f0d 100644 --- a/app/src/main/res/layout/include_case_location.xml +++ b/app/src/main/res/layout/include_case_location.xml @@ -26,6 +26,7 @@ android:layout_marginEnd="@dimen/margin_10dp" android:layout_toStartOf="@id/locationMapView" android:paddingHorizontal="3dp" + android:textColor="@color/textColor" android:textSize="@dimen/textFontSize" /> @@ -78,9 +80,12 @@ android:layout_height="wrap_content" android:layout_marginStart="100dp" android:layout_marginEnd="10dp" - android:background="@drawable/bg_layout" - android:paddingHorizontal="3dp" - android:paddingVertical="5dp" /> + android:background="@null" + android:hint="社区通过地图选点获取" + android:padding="3dp" + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> @@ -97,14 +102,13 @@ + android:padding="3dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_type.xml b/app/src/main/res/layout/include_case_type.xml index 7ef6b28..a649ee0 100644 --- a/app/src/main/res/layout/include_case_type.xml +++ b/app/src/main/res/layout/include_case_type.xml @@ -12,22 +12,14 @@ style="@style/itemLayoutStyle"> + style="@style/tagTextViewStyle" + android:text="案卷类型" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷大类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷小类" /> + android:hint="请选择" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/item_notice_list.xml b/app/src/main/res/layout/item_notice_list.xml index 51f92f1..f47ac66 100644 --- a/app/src/main/res/layout/item_notice_list.xml +++ b/app/src/main/res/layout/item_notice_list.xml @@ -17,7 +17,8 @@ android:layout_toStartOf="@id/noticeDateView" android:singleLine="true" android:text="这里是标题" - android:textSize="@dimen/titleFontSize" /> + android:textColor="@color/listMainColor" + android:textSize="@dimen/textFontSize" /> @@ -44,8 +45,7 @@ android:layout_toStartOf="@id/messageTagView" android:singleLine="true" android:text="这里是消息内容这里是消息是息内容这里是消息是息内容这里是消息是消消息内容这是消息内容" - android:textColor="@color/gray" - android:textSize="@dimen/textFontSize" /> + android:textColor="@color/listAuxiliaryColor" /> #FFFFFF #F5F5F5 #E5E5E5 - #DEDEDE #D3D3D3 - #C0C0C0 + #C0C0C0 #A9A9A9 #808080 #000000 diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 99e1033..36e27a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -62,8 +62,8 @@ private static final String TAG = "ArcGISMapActivity"; private Context context = ArcGISMapActivity.this; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -84,9 +84,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("选择点位").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java index 8fb6234..9b91c19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java @@ -29,8 +29,8 @@ **/ public class CaseCheckActivity extends BaseActivity { - @BindView(R.id.checkTopLayout) - QMUITopBarLayout checkTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.checkTabLayout) TabLayout checkTabLayout; @BindView(R.id.checkViewPager) @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - checkTopLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); - checkTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - checkTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核查").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 22330b8..6a7e4a3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -60,8 +60,8 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; -public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { +public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, + IUploadFileView, ICaseNextNodeView, ICaseHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 1ab5c16..f1bbfbc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseCheckedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 2be4a4e..19e9e6c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -41,8 +41,8 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseDetailActivity.this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseStatusView) @@ -85,9 +85,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 3b72d2f..b10e449 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -26,8 +26,8 @@ public class CaseHandleActivity extends BaseActivity { private static final String[] pageTitles = {"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; - @BindView(R.id.handleTopLayout) - QMUITopBarLayout handleTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.handleTabLayout) TabLayout handleTabLayout; @BindView(R.id.handleViewPager) @@ -42,9 +42,9 @@ @Override protected void setupTopBarLayout() { - handleTopLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); - handleTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - handleTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷处理").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index e2bbe6d..06f157f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { private Context context = CaseHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("已办案卷").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eaea1b6..864fa03 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -35,8 +35,8 @@ public class CaseListResultActivity extends BaseActivity implements ICaseListView { private static final String TAG = "CaseListResultActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.emptyView) QMUIEmptyView emptyView; @BindView(R.id.refreshLayout) @@ -68,9 +68,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查询结果").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 5ab5294..d88d6f3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -62,8 +62,8 @@ ICaseHandleListView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @BindView(R.id.radioGroup) @@ -90,9 +90,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查看").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index a7e17d9..d5583c2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -30,8 +30,8 @@ public class CaseProcessActivity extends BaseActivity implements ICaseProcessView { private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.processRecyclerView) RecyclerView processRecyclerView; private CaseProcessPresenterImpl caseProcessPresenter; @@ -45,9 +45,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("处理记录").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 111a834..981b54e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -38,8 +38,8 @@ private static final String TAG = "CaseSearchActivity"; private Context context = this; - @BindView(R.id.caseTopLayout) - QMUITopBarLayout caseTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseClassView) TextView caseClassView; @BindView(R.id.caseLargeClassView) @@ -74,9 +74,9 @@ @Override protected void setupTopBarLayout() { - caseTopLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); - caseTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - caseTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷查询").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6ac7b43..d24b0ed 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -40,8 +40,8 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseTodoHandledDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseHandleStatusView) @@ -80,9 +80,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 63bea62..f482b7e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -127,9 +127,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 private ArrayList realPaths = new ArrayList<>();//真是图片路径 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; @@ -278,7 +278,7 @@ break; case R.id.locationMapView: String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -655,11 +655,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index c21eb80..ee68ac3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ ImageView addImageView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; + @BindView(R.id.locationMapView) + ImageView locationMapView; private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; @@ -106,6 +109,7 @@ @Override public void initEvent() { submitButton.setChangeAlphaWhenPress(true); + locationMapView.setVisibility(View.GONE); } @OnClick({R.id.shopLayout, R.id.addImageView, R.id.submitButton}) @@ -199,6 +203,7 @@ latitudeView.setText(String.valueOf(latitude)); communityNameView.setText(community); shopView.setText(shopName); + shopView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index f42c10d..49a80cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -91,9 +91,9 @@ private UploadImagePresenterImpl uploadImagePresenter; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List imageList = new ArrayList<>();//上传到服务器的数据集 - private String eorc = "请选择"; - private String typeCode = "请选择"; - private String typeDetailCode = "请选择";//默认值，防止用户不选择直接跳过 + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private ImageRecycleViewAdapter imageAdapter; private String gridId; @@ -223,7 +223,7 @@ case R.id.locationMapView: //根据情况加载不同图层 String type = caseClassView.getText().toString(); - if (type.equals("请选择")) { + if (type.equals("")) { ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); return; } @@ -400,11 +400,11 @@ ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); return; } - if (eorc.equals("请选择") || typeCode.equals("请选择")) { + if (eorc.equals("") || typeCode.equals("")) { ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); return; } - if (typeDetailCode.equals("请选择")) { + if (typeDetailCode.equals("")) { ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index d364d7c..8914a5d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -40,8 +40,8 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { private Context context = CaseVerifiedDetailActivity.this; - @BindView(R.id.detailTopLayout) - QMUITopBarLayout detailTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) @@ -82,9 +82,9 @@ @Override protected void setupTopBarLayout() { - detailTopLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); - detailTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - detailTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java index 4bc83aa..60d362b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java @@ -24,8 +24,8 @@ public class CaseVerifyActivity extends BaseActivity { - @BindView(R.id.verifyTopLayout) - QMUITopBarLayout verifyTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.verifyTabLayout) TabLayout verifyTabLayout; @BindView(R.id.verifyViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - verifyTopLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); - verifyTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - verifyTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("案卷核实").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 3d35bd3..5663545 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -31,8 +31,8 @@ public class ChangePasswordActivity extends BaseActivity implements View.OnClickListener, IChangePasswordView { private static final String TAG = "ChangePasswordActivity"; - @BindView(R.id.passwordTopLayout) - QMUITopBarLayout passwordTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.originalEditView) EditText originalEditView; @BindView(R.id.newEditView) @@ -50,9 +50,9 @@ @Override protected void setupTopBarLayout() { - passwordTopLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); - passwordTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - passwordTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("修改密码").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); 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 6c03459..ecdb995 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -34,8 +34,8 @@ private static final String TAG = "DataAnalysisActivity"; private Context context = this; - @BindView(R.id.dataTopLayout) - QMUITopBarLayout dataTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.startDateView) TextView startDateView; @BindView(R.id.selectStartDateView) @@ -54,9 +54,9 @@ @Override protected void setupTopBarLayout() { - dataTopLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); - dataTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - dataTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("统计分析").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 0564332..70dfacf 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -38,8 +38,8 @@ public class DisplayMapActivity extends BaseActivity implements View.OnClickListener { private static final String TAG = "DisplayMapActivity"; - @BindView(R.id.gisTopLayout) - QMUITopBarLayout gisTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.mapView) MapView mapView; @@ -53,9 +53,9 @@ @Override protected void setupTopBarLayout() { - gisTopLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); - gisTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - gisTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("查看案卷位置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java index 5da7fb4..f09c0aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/EventSourceActivity.java @@ -29,8 +29,8 @@ public class EventSourceActivity extends BaseActivity { private static final String TAG = EventSourceActivity.class.getSimpleName(); - @BindView(R.id.resourceTopLayout) - QMUITopBarLayout resourceTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - resourceTopLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); - resourceTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - resourceTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("问题来源").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java index 058f5d2..6bf238a 100644 --- a/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HelpfulActivity.java @@ -17,8 +17,8 @@ **/ public class HelpfulActivity extends BaseActivity { - @BindView(R.id.helpTopLayout) - QMUITopBarLayout helpTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @Override public int initLayoutView() { @@ -27,9 +27,9 @@ @Override protected void setupTopBarLayout() { - helpTopLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); - helpTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - helpTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("帮助中心").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java index 338b20e..374a239 100644 --- a/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/HighEventListActivity.java @@ -29,8 +29,8 @@ public class HighEventListActivity extends BaseActivity { private static final String TAG = HighEventListActivity.class.getSimpleName(); - @BindView(R.id.highEventTopLayout) - QMUITopBarLayout highEventTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.eventTabLayout) TabLayout eventTabLayout; @BindView(R.id.eventViewPager) @@ -43,9 +43,9 @@ @Override protected void setupTopBarLayout() { - highEventTopLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); - highEventTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - highEventTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("高发问题").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java index 90f26d0..4996f55 100644 --- a/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/OvertimeCaseActivity.java @@ -24,8 +24,8 @@ public class OvertimeCaseActivity extends BaseActivity { - @BindView(R.id.overtimeTopLayout) - QMUITopBarLayout overtimeTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.overtimeTabLayout) TabLayout overtimeTabLayout; @BindView(R.id.overtimeViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - overtimeTopLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); - overtimeTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - overtimeTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("超时督办").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java index a26159c..657ca78 100644 --- a/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PersonOnlineActivity.java @@ -24,8 +24,8 @@ public class PersonOnlineActivity extends BaseActivity { private static final String[] pageTitles = {"人员分布", "人员列表"}; - @BindView(R.id.personTopLayout) - QMUITopBarLayout personTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.personTabLayout) TabLayout personTabLayout; @BindView(R.id.personViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - personTopLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); - personTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - personTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("在岗人员").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java index 807e94d..5fd9170 100644 --- a/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UrgentCaseActivity.java @@ -24,8 +24,8 @@ public class UrgentCaseActivity extends BaseActivity { - @BindView(R.id.urgentTopLayout) - QMUITopBarLayout urgentTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.urgentTabLayout) TabLayout urgentTabLayout; @BindView(R.id.urgentViewPager) @@ -40,9 +40,9 @@ @Override protected void setupTopBarLayout() { - urgentTopLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); - urgentTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - urgentTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("紧急要件").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 07fdd6c..3a8ebc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -19,8 +19,8 @@ **/ public class UserInfoActivity extends BaseActivity { - @BindView(R.id.userTopLayout) - QMUITopBarLayout userTopLayout; + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; @BindView(R.id.userNameView) TextView userNameView; @BindView(R.id.userPhoneView) @@ -35,9 +35,9 @@ @Override protected void setupTopBarLayout() { - userTopLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); - userTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - userTopLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + topLayout.setTitle("个人资料").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/app/src/main/res/layout/activity_case_analysis.xml b/app/src/main/res/layout/activity_case_analysis.xml index aa1aa39..0f0e966 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> - + @@ -49,10 +49,10 @@ @@ -61,7 +61,6 @@ + android:layout_marginStart="100dp" /> @@ -81,7 +79,6 @@ @@ -137,7 +131,6 @@ + android:layout_marginStart="100dp" /> @@ -165,12 +157,10 @@ @@ -187,10 +177,10 @@ @@ -199,7 +189,6 @@ @@ -234,19 +221,16 @@ + style="@style/tagTextViewStyle" + android:text="核查意见" /> @@ -265,13 +249,9 @@ + android:hint="请选择" /> - + + android:layout_marginStart="100dp" /> @@ -45,7 +39,6 @@ + android:layout_marginStart="100dp" /> @@ -65,7 +57,6 @@ + android:layout_marginStart="100dp" /> @@ -85,7 +75,6 @@ diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index a2b7f65..4f4a7b4 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -6,11 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - + @@ -52,10 +48,10 @@ @@ -72,9 +68,10 @@ @@ -91,10 +88,10 @@ @@ -111,10 +108,10 @@ @@ -130,10 +127,10 @@ @@ -142,7 +139,6 @@ @@ -197,7 +189,6 @@ + android:layout_marginStart="100dp" /> @@ -217,7 +207,6 @@ + android:layout_marginStart="100dp" /> @@ -237,7 +225,6 @@ + android:layout_marginStart="100dp" /> @@ -257,7 +243,6 @@ diff --git a/app/src/main/res/layout/activity_case_handle.xml b/app/src/main/res/layout/activity_case_handle.xml index 3018916..66bf3bd 100644 --- a/app/src/main/res/layout/activity_case_handle.xml +++ b/app/src/main/res/layout/activity_case_handle.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理结果" /> + android:hint="请选择" /> @@ -217,17 +206,15 @@ + android:hint="请输入申请理由" + android:padding="3dp" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index ed203bc..c0d78bf 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,9 @@ @@ -92,11 +84,10 @@ @@ -113,11 +104,10 @@ @@ -133,10 +123,10 @@ @@ -154,12 +144,11 @@ @@ -200,7 +187,6 @@ + android:layout_marginStart="100dp" /> @@ -220,7 +205,6 @@ + android:layout_marginStart="100dp" /> @@ -240,7 +223,6 @@ diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 260ece2..e45e6af 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -5,11 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="处理状态" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="开始时间" /> + android:hint="请选择开始时间" /> + style="@style/tagTextViewStyle" + android:text="截止时间" /> + android:hint="请选择截止时间" /> @@ -48,10 +46,10 @@ @@ -68,10 +66,10 @@ @@ -80,7 +78,6 @@ @@ -135,7 +128,6 @@ + android:layout_marginStart="100dp" /> @@ -155,7 +146,6 @@ @@ -230,19 +217,15 @@ + style="@style/tagTextViewStyle" + android:text="督办意见" /> @@ -261,13 +244,9 @@ + android:hint="请选择" /> - + @@ -51,11 +46,10 @@ @@ -72,11 +66,10 @@ @@ -92,11 +85,10 @@ @@ -112,11 +104,10 @@ @@ -132,10 +123,10 @@ @@ -144,7 +135,6 @@ @@ -209,21 +194,20 @@ + + + android:layout_marginStart="100dp" /> - - diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 14a1020..20b2bd5 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -41,16 +41,14 @@ + android:padding="3dp" /> @@ -173,7 +171,6 @@ android:id="@+id/addImageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10dp" android:background="@drawable/bg_layout" android:padding="@dimen/padding_10dp" android:src="@drawable/ic_add_black" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index ab7b4ba..2340349 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -40,16 +40,14 @@ + android:padding="3dp" /> @@ -74,7 +72,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_case_urgent.xml b/app/src/main/res/layout/activity_case_urgent.xml index f3ede63..f819350 100644 --- a/app/src/main/res/layout/activity_case_urgent.xml +++ b/app/src/main/res/layout/activity_case_urgent.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + @@ -54,10 +50,10 @@ @@ -66,7 +62,6 @@ + android:layout_marginStart="100dp" /> @@ -86,7 +80,6 @@ diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml index 80d1e58..1909920 100644 --- a/app/src/main/res/layout/activity_case_verify.xml +++ b/app/src/main/res/layout/activity_case_verify.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + style="@style/tagTextViewStyle" + android:text="处理意见" /> + style="@style/tagTextViewStyle" + android:text="派遣时间" /> + style="@style/tagTextViewStyle" + android:text="完成时限" /> + style="@style/tagTextViewStyle" + android:text="案卷图片" /> + android:layout_marginStart="100dp" /> @@ -173,12 +152,8 @@ + style="@style/tagTextViewStyle" + android:text="核实意见" /> + android:hint="请选择" /> diff --git a/app/src/main/res/layout/activity_event_resource.xml b/app/src/main/res/layout/activity_event_resource.xml index 3da2ccb..95d6f1d 100644 --- a/app/src/main/res/layout/activity_event_resource.xml +++ b/app/src/main/res/layout/activity_event_resource.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + + style="@style/tagTextViewStyle" + android:text="商\u3000\u3000户" /> - + + style="@style/tagTextViewStyle" + android:text="店\u3000\u3000主" /> + android:background="@null" + android:hint="请输入店主姓名" + android:padding="3dp" /> @@ -86,49 +78,39 @@ + style="@style/tagTextViewStyle" + android:text="电话号码" /> + android:padding="3dp" /> - + style="@style/tagTextViewStyle" + android:text="案卷情况" /> + android:padding="3dp" /> @@ -153,7 +135,6 @@ android:id="@+id/selectedResultView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:scrollbars="none" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 19496ef..604d9d6 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + android:padding="5dp" + android:singleLine="true" /> @@ -70,19 +63,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="密码确认" - android:textColor="@color/black" android:textSize="@dimen/textFontSize" /> + android:padding="5dp" + android:singleLine="true" /> diff --git a/app/src/main/res/layout/activity_three_package.xml b/app/src/main/res/layout/activity_three_package.xml index 543be6e..a5ffbe8 100644 --- a/app/src/main/res/layout/activity_three_package.xml +++ b/app/src/main/res/layout/activity_three_package.xml @@ -5,11 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + + style="@style/tagTextViewStyle" + android:text="案卷编号" /> @@ -32,23 +28,14 @@ + style="@style/tagTextViewStyle" + android:text="案卷类型" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷大类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷小类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="社\u3000\u3000区" /> @@ -146,24 +111,17 @@ + style="@style/tagTextViewStyle" + android:text="案卷地点" /> + android:background="@null" + android:padding="5dp" /> + style="@style/tagTextViewStyle" + android:text="案卷情况" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index c32fde3..f657098 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -9,16 +9,15 @@ @@ -29,16 +28,15 @@ @@ -55,10 +53,10 @@ @@ -75,10 +73,10 @@ @@ -94,10 +92,10 @@ @@ -106,7 +104,6 @@ @@ -171,10 +163,10 @@ diff --git a/app/src/main/res/layout/include_case_location.xml b/app/src/main/res/layout/include_case_location.xml index f347c75..c461f0d 100644 --- a/app/src/main/res/layout/include_case_location.xml +++ b/app/src/main/res/layout/include_case_location.xml @@ -26,6 +26,7 @@ android:layout_marginEnd="@dimen/margin_10dp" android:layout_toStartOf="@id/locationMapView" android:paddingHorizontal="3dp" + android:textColor="@color/textColor" android:textSize="@dimen/textFontSize" /> @@ -78,9 +80,12 @@ android:layout_height="wrap_content" android:layout_marginStart="100dp" android:layout_marginEnd="10dp" - android:background="@drawable/bg_layout" - android:paddingHorizontal="3dp" - android:paddingVertical="5dp" /> + android:background="@null" + android:hint="社区通过地图选点获取" + android:padding="3dp" + android:textColor="@color/textColor" + android:textColorHint="@color/hintColor" + android:textSize="@dimen/textFontSize" /> @@ -97,14 +102,13 @@ + android:padding="3dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_type.xml b/app/src/main/res/layout/include_case_type.xml index 7ef6b28..a649ee0 100644 --- a/app/src/main/res/layout/include_case_type.xml +++ b/app/src/main/res/layout/include_case_type.xml @@ -12,22 +12,14 @@ style="@style/itemLayoutStyle"> + style="@style/tagTextViewStyle" + android:text="案卷类型" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷大类" /> + android:hint="请选择" /> + style="@style/tagTextViewStyle" + android:text="案卷小类" /> + android:hint="请选择" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/item_notice_list.xml b/app/src/main/res/layout/item_notice_list.xml index 51f92f1..f47ac66 100644 --- a/app/src/main/res/layout/item_notice_list.xml +++ b/app/src/main/res/layout/item_notice_list.xml @@ -17,7 +17,8 @@ android:layout_toStartOf="@id/noticeDateView" android:singleLine="true" android:text="这里是标题" - android:textSize="@dimen/titleFontSize" /> + android:textColor="@color/listMainColor" + android:textSize="@dimen/textFontSize" /> @@ -44,8 +45,7 @@ android:layout_toStartOf="@id/messageTagView" android:singleLine="true" android:text="这里是消息内容这里是消息是息内容这里是消息是息内容这里是消息是消消息内容这是消息内容" - android:textColor="@color/gray" - android:textSize="@dimen/textFontSize" /> + android:textColor="@color/listAuxiliaryColor" /> #FFFFFF #F5F5F5 #E5E5E5 - #DEDEDE #D3D3D3 - #C0C0C0 + #C0C0C0 #A9A9A9 #808080 #000000 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8936f98..136cb6f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -8,6 +8,33 @@ @color/colorAccent + + + + + +