diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 01e9ff6..79ec6c0 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -5,7 +5,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -49,8 +49,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查询结果"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_option_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_option_title" /> + + + layout="@layout/include_sub_base_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_option_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_option_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_option_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_option_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_option_title" /> + + + layout="@layout/include_sub_option_title" /> + + finish()); diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index df24e87..9aaf4ca 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -21,6 +20,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -45,8 +45,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("桥梁养护记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java index 543efc5..b392a23 100644 --- a/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/OvertimeCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("超时督办"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PersonActivity.java b/app/src/main/java/com/casic/dcms/view/PersonActivity.java index 6b64e32..6a05795 100644 --- a/app/src/main/java/com/casic/dcms/view/PersonActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PersonActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("在岗人员"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 42a1842..084921e 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -8,7 +8,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -24,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; @@ -52,8 +52,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("管网管理"); diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 98d5a04..d58c9bf 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -19,6 +18,7 @@ import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; @@ -40,8 +40,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -51,7 +51,7 @@ protected void observeRequestState() { } - + @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); @@ -72,7 +72,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); eorc = String.valueOf(position + 1); //获取案卷大类 @@ -112,7 +112,7 @@ dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseLargeClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -154,7 +154,7 @@ dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseSmallClassView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); @@ -185,7 +185,7 @@ caseState = beans.get(position).getValue(); viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); } }).build().show(); } @@ -195,7 +195,7 @@ viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择处理时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -206,7 +206,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.startTimeView.setText(date); - viewBinding.startTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.startTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); @@ -214,7 +214,7 @@ viewBinding.selectEndDateView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择截止时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -225,7 +225,7 @@ String date = LongHub.timestampToDate(millSeconds); viewBinding.endTimeView.setText(date); - viewBinding.endTimeView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + viewBinding.endTimeView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); }).build().show(getSupportFragmentManager(), "year_month_day"); } }); diff --git a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java index 3b0616b..4973258 100644 --- a/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/StreetlightManagerActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -13,6 +12,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -24,8 +24,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("路灯管理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index 619cc13..d946ba9 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -7,7 +7,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -51,8 +50,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); viewBinding.titleBarLayout.titleView.setText("窨井列表"); diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index baf5dd3..cfa4452 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("三包处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index 8b0e707..3c5c6da 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -19,6 +18,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -28,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("部门处置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index f5a6f4e..607ef1a 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -15,6 +14,7 @@ import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -26,8 +26,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷处理"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java index 890744d..2fead07 100644 --- a/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/ArcGISMapActivity.java @@ -11,8 +11,6 @@ import android.view.MotionEvent; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -48,6 +46,7 @@ import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; @@ -80,8 +79,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("选择点位"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index dd10be3..e4e42b3 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.widget.RadioGroup; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -43,6 +42,7 @@ import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -65,8 +65,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("案卷查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -282,25 +282,25 @@ private void resetRadioButton(int index) { switch (index) { case 0: - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 caseViewModel.obtainHandleCaseList(null, null, 1, true); break; case 1: - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 caseViewModel.obtainVerifyCaseList(1000, 1, false); break; case 2: - viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); - viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); - viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.mainTextColor)); + viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); + viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); + viewBinding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 caseViewModel.obtainCheckCaseList(1000, 1, false); diff --git a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java index 2b9f56f..5bd7e85 100644 --- a/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/DisplayMapActivity.java @@ -6,8 +6,6 @@ import android.graphics.drawable.BitmapDrawable; import android.view.View; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityGisBinding; @@ -29,6 +27,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -40,8 +39,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("位置查看"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 71c96b7..9afdce2 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -32,6 +31,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.SaveKeyValues; import com.pengxh.androidx.lite.vm.LoadState; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("报警分布"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java index dbc2716..ab7d389 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WorkerOnMapActivity.java @@ -11,8 +11,6 @@ import android.view.View; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.amap.api.location.AMapLocation; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityWorkerMapBinding; @@ -35,6 +33,7 @@ import com.esri.arcgisruntime.util.ListenableList; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -57,8 +56,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("查看位置"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -66,7 +65,7 @@ @Override protected void observeRequestState() { - + } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index bae381d..efbfb12 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -3,8 +3,6 @@ import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; - import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseAnalysisBinding; import com.casic.dcms.model.DataAnalysisGridModel; @@ -13,6 +11,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -29,8 +28,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("统计分析"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 02ca129..059fe8b 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -7,7 +7,6 @@ import android.view.View; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -29,6 +28,7 @@ import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; @@ -53,8 +53,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("保洁作业记录"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index c456e8b..bfedccf 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -49,6 +48,7 @@ import com.luck.picture.lib.entity.LocalMedia; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -70,8 +70,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("公厕保洁"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); @@ -179,7 +179,7 @@ viewBinding.startTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择开始时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -195,7 +195,7 @@ viewBinding.endTimeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(context, R.color.mainThemeColor)) + new TimePickerDialog.Builder().setThemeColor(IntHub.convertColor(context, R.color.mainThemeColor)) .setTitleStringId("请选择结束时间") .setWheelItemTextSize(16) .setCyclic(false) @@ -345,7 +345,7 @@ } private void addPictureMarker(Point point) { - BitmapDrawable symbolDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.on_line); + BitmapDrawable symbolDrawable = (BitmapDrawable) IntHub.convertDrawable(this, R.mipmap.on_line); if (symbolDrawable != null) { PictureMarkerSymbol symbolMarker = new PictureMarkerSymbol(symbolDrawable); symbolMarker.setWidth(64); diff --git a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java index 1245e45..711f3f8 100644 --- a/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/urgent/UrgentCaseActivity.java @@ -2,7 +2,6 @@ import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.casic.dcms.R; @@ -14,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import java.util.ArrayList; @@ -23,8 +23,8 @@ @Override protected void setupTopBarLayout() { - ImmerseStatusBarManager.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); - ImmersionBar.with(this).statusBarDarkFont(false).init(); + ImmerseStatusBarManager.setColor(this, IntHub.convertColor(this, R.color.white)); + ImmersionBar.with(this).statusBarDarkFont(true).init(); viewBinding.titleBarLayout.titleView.setText("紧急要件"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(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 28b661b..0fda59d 100644 --- a/app/src/main/res/layout/activity_case_analysis.xml +++ b/app/src/main/res/layout/activity_case_analysis.xml @@ -8,7 +8,9 @@ + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_option_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_base_title" /> + + + layout="@layout/include_sub_option_title" /> + + + layout="@layout/include_sub_option_title" /> + + + layout="@layout/include_sub_base_title" /> + +