From a518a928b25c3691b6f6a13b73f39b873937a21c Mon Sep 17 00:00:00 2001 From: chenglifeng Date: Wed, 25 Sep 2024 16:50:45 +0800 Subject: [PATCH] replace App.kt --- app/src/main/java/com/project/survey/App.java | 144 ------------------ app/src/main/java/com/project/survey/App.kt | 100 ++++++++++++ .../survey/ui/base/BaseBindingActivity.kt | 4 - .../survey/ui/base/BaseSurveyNewActivity.java | 6 +- .../RtkBaseCorrectActivity.java | 6 +- .../base/RtkMatchingPointsActivity.java | 2 +- .../BingCeAbstractListActivity.java | 2 +- .../ControlPointsNewActivity.java | 2 +- .../CoordinatePointsLibraryActivity.java | 2 +- .../SetupStationCurrentActivity.java | 2 +- .../SetupStationInputActivity.java | 2 +- .../SetupStationKnownBackSightActivity.java | 2 +- .../SetupStationResectionActivity.java | 2 +- .../SetupStationResectionSubActivity.java | 2 +- .../setupstation/StakingNewJobActivity.java | 8 +- .../util/ControlPointsDetailDialogUtils.java | 2 +- .../util/ControlPointsExportDialogUtils.java | 2 +- .../util/ControlPointsFilterDialogUtils.java | 2 +- .../ControlPointsImportConfigDialogUtils.java | 2 +- .../pointlofting/PointStakingActivity.java | 6 +- .../pointlofting/record/RecordsActivity.java | 10 +- .../record/util/RecordItemVH.java | 2 +- .../util/RecordsActivityExportUtils.java | 2 +- .../util/RecordsActivityFilterUtils.java | 2 +- .../measure/CodeLibraryActivity.java | 2 +- .../measure/PointSurveyNewActivity.java | 12 +- .../com/project/survey/util/DensityUtils.java | 4 +- .../project/survey/util/KeyboardUtils.java | 2 +- .../com/project/survey/util/ResUtils.java | 6 +- .../java/com/project/survey/util/Utils.java | 6 +- .../bingce/dragdrop/FunctionAdapter.java | 4 +- .../bingce/dragdrop/FunctionBlockAdapter.java | 2 +- 32 files changed, 152 insertions(+), 202 deletions(-) delete mode 100644 app/src/main/java/com/project/survey/App.java create mode 100644 app/src/main/java/com/project/survey/App.kt diff --git a/app/src/main/java/com/project/survey/App.java b/app/src/main/java/com/project/survey/App.java deleted file mode 100644 index fc21b56..0000000 --- a/app/src/main/java/com/project/survey/App.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.project.survey; - -import static com.bingce.AppChannel.customChannel; - -import android.app.Application; -import android.util.Log; - -import com.bingce.AppChannel; -import com.bingce.BaseApp; -import com.bingce.data.database.DBQueryConstant; -import com.bingce.data.database.KeyValueDb; -import com.bingce.data.database.ProjectCoordinateDatabase; -import com.bingce.data.database.ProjectDb; -import com.bingce.data.database.RoadJobLineDatabase; -import com.bingce.data.database.SurveyRecordDatabase; -import com.bingce.data.database.SyncRecordDatabase; -import com.bingce.data.surveyor.designdata.project.ProjectConstants; -import com.bingce.data.surveyor.designdata.project.ProjectRecord; -import com.bingce.device.Device; -import com.bingce.device.DeviceProgressDialogBuilderImpl; -import com.bingce.rtk.command.RTK; -import com.bingce.utils.CoordinatorSystemNotifierImpl; -import com.bingce.utils.SdkUtils; -import com.bingce.utils.ThreadPoolUtil; -import com.tencent.mmkv.MMKV; - -import org.polaric.colorful.Colorful; - -import blankj.utilcode.util.Utils; -import cn.liuyanbing.surveyor.BCSdk; -import io.reactivex.functions.Consumer; -import io.reactivex.plugins.RxJavaPlugins; - -public class App extends BaseApp { - private final CoordinatorSystemNotifierImpl coordinatorSystemNotifier = new CoordinatorSystemNotifierImpl(); - - private static App app; - - public boolean isThemeDark; - /** - * 磁偏角，用于校正指南针 - */ - public float magneticDeclination = 0; - - public int lastRecordBrowseType = 0; - - /** - * 是否在记录界面显示当前工程全部数据 - */ - public boolean isShowAllRecordInCurrentProject = true; - - public boolean isLandscape() { - return false; - } - - @Override - public void onCreate() { - customChannel = AppChannel.CUSTOM_CONTROL_PRO;//AppChannel.CUSTOM_PUBLIC; - super.onCreate(); - app = this; - MMKV.initialize(this); - - RxJavaPlugins.setErrorHandler(new Consumer() { - @Override - public void accept(Throwable throwable) { - Log.e("rxThrowable", String.valueOf(throwable)); - } - }); - - initThemeDark(); - Utils.init(this); - initDatabase(); - initDevice(); - - } - - @Override - protected void initTtsManager() { - - } - - @Override - public String applicationId() { - return ""; - } - - private void initDevice() { - - //初始化设备相关代码 - Device.init( - DeviceProgressDialogBuilderImpl.builder(), - coordinatorSystemNotifier, - coordinateSystem -> { - ThreadPoolUtil.execute(() -> { - //查询当前项目 - String currentProjectId = KeyValueDb.currentProjectId(); - ProjectRecord currentProject = ProjectDb.getInstance() - .rawQueryData(DBQueryConstant.findById(ProjectConstants.DB_NAME, currentProjectId)); - if (currentProject != null) { - currentProject.coordinateSystem = coordinateSystem; - ProjectDb.getInstance().save(currentProject); - } - }); - }); - RTK.init(coordinatorSystemNotifier); - - } - - private void initDatabase() { - ProjectCoordinateDatabase.openDb(this, null); - SurveyRecordDatabase.openDb(this, null); - SyncRecordDatabase.openDb(this, null); - RoadJobLineDatabase.openDb(this, null); - } - - public boolean isThemeDark() { - return false; - } - - @Override - public int angleNotNumber() { - return 6; - } - - - private void initThemeDark() { - Colorful.defaults() -// .primaryColor(Colorful.ThemeColor.SHANG_HAI_PROJECT) -// .accentColor(Colorful.ThemeColor.SHANG_HAI_PROJECT) - .translucent(false) - .dark(false); - Colorful.init(this); - -// Colorful.config(this).primaryColor(Colorful.ThemeColor.BROWN).apply(); -// Colorful.config(this).accentColor(Colorful.ThemeColor.BROWN).apply(); - } - - - public static App getApp() { - return app; - } - - -} diff --git a/app/src/main/java/com/project/survey/App.kt b/app/src/main/java/com/project/survey/App.kt new file mode 100644 index 0000000..a61cc56 --- /dev/null +++ b/app/src/main/java/com/project/survey/App.kt @@ -0,0 +1,100 @@ +package com.project.survey + +import android.util.Log +import blankj.utilcode.util.Utils +import com.bingce.AppChannel +import com.bingce.BaseApp +import com.bingce.coordlib.model.CoordinateSystem +import com.bingce.data.database.DBQueryConstant +import com.bingce.data.database.KeyValueDb +import com.bingce.data.database.ProjectCoordinateDatabase +import com.bingce.data.database.ProjectDb +import com.bingce.data.database.RoadJobLineDatabase +import com.bingce.data.database.SurveyRecordDatabase +import com.bingce.data.database.SyncRecordDatabase +import com.bingce.data.surveyor.designdata.project.ProjectConstants +import com.bingce.device.Device +import com.bingce.device.DeviceProgressDialogBuilderImpl +import com.bingce.rtk.command.RTK +import com.bingce.utils.CoordinatorSystemNotifierImpl +import com.bingce.utils.ThreadPoolUtil +import com.tencent.mmkv.MMKV +import io.reactivex.plugins.RxJavaPlugins +import org.polaric.colorful.Colorful + +class App : BaseApp() { + + companion object { + lateinit var instance: App + + // 磁偏角，用于校正指南针 + const val magneticDeclination: Float = 0f + + // 是否在记录界面显示当前工程全部数据 + const val isShowAllRecordInCurrentProject = true + + } + + var lastRecordBrowseType: Int = 0 + private val coordinatorSystemNotifier = CoordinatorSystemNotifierImpl() + + override fun onCreate() { + AppChannel.customChannel = AppChannel.CUSTOM_CONTROL_PRO + super.onCreate() + instance = this + + // MMKV初始化 + MMKV.initialize(this) + RxJavaPlugins.setErrorHandler { throwable -> + Log.e("rxThrowable", throwable.toString()) + } + Colorful.defaults() +// .primaryColor(Colorful.ThemeColor.SHANG_HAI_PROJECT) +// .accentColor(Colorful.ThemeColor.SHANG_HAI_PROJECT) + .translucent(false) + .dark(false) + Colorful.init(this) + + Utils.init(this) + initDatabase() + initDevice() + } + + private fun initDatabase() { + ProjectCoordinateDatabase.openDb(this, null) + SurveyRecordDatabase.openDb(this, null) + SyncRecordDatabase.openDb(this, null) + RoadJobLineDatabase.openDb(this, null) + } + + private fun initDevice() { + //初始化设备相关代码 + Device.init( + DeviceProgressDialogBuilderImpl.builder(), + coordinatorSystemNotifier + ) { coordinateSystem -> + ThreadPoolUtil.execute { + //查询当前项目 + val currentProjectId = KeyValueDb.currentProjectId() + val currentProject = ProjectDb.getInstance().rawQueryData( + DBQueryConstant.findById(ProjectConstants.DB_NAME, currentProjectId) + ) + if (currentProject != null) { + currentProject.coordinateSystem = coordinateSystem + ProjectDb.getInstance().save(currentProject) + } + } + } + RTK.init(coordinatorSystemNotifier) + } + + override fun isLandscape(): Boolean = false + + override fun initTtsManager() {} + + override fun applicationId(): String = "" + + override fun isThemeDark(): Boolean = false + + override fun angleNotNumber(): Int = 6 +} \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/base/BaseBindingActivity.kt b/app/src/main/java/com/project/survey/ui/base/BaseBindingActivity.kt index cf36d92..930d7bc 100644 --- a/app/src/main/java/com/project/survey/ui/base/BaseBindingActivity.kt +++ b/app/src/main/java/com/project/survey/ui/base/BaseBindingActivity.kt @@ -7,11 +7,8 @@ import androidx.annotation.StringRes import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.widget.Toolbar -import androidx.core.content.ContextCompat import androidx.viewbinding.ViewBinding -import blankj.utilcode.util.Utils import com.gyf.immersionbar.ImmersionBar -import com.project.survey.App import com.project.survey.R import com.project.survey.util.param.ParamUtil import org.polaric.colorful.Colorful @@ -47,7 +44,6 @@ abstract class BaseBindingActivity : AppCompatActivity() { setTheme(Colorful.getThemeDelegate().styleResBase) getTheme().applyStyle(Colorful.getThemeDelegate().styleResPrimary, true) getTheme().applyStyle(Colorful.getThemeDelegate().styleResAccent, true) - val app = Utils.getApp() as App delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_YES // if (app.isThemeDark) { // delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_YES diff --git a/app/src/main/java/com/project/survey/ui/base/BaseSurveyNewActivity.java b/app/src/main/java/com/project/survey/ui/base/BaseSurveyNewActivity.java index d929f70..61c1680 100644 --- a/app/src/main/java/com/project/survey/ui/base/BaseSurveyNewActivity.java +++ b/app/src/main/java/com/project/survey/ui/base/BaseSurveyNewActivity.java @@ -10,7 +10,6 @@ import android.view.WindowManager; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; import androidx.core.content.ContextCompat; import com.bingce.AppChannel; @@ -50,7 +49,6 @@ import org.polaric.colorful.ColorfulActivity; import java.util.List; import blankj.utilcode.util.ToastUtils; -import blankj.utilcode.util.Utils; public abstract class BaseSurveyNewActivity extends ColorfulActivity implements IUIProvider, Device.IDeviceConnectListener, RtkManager.IRtkListener, TsListener.MeasCoordinateListener, TsListener.MeasSdAnglesListener, TsListener.AnglesRefreshListener, TsListener.BatteryRefreshListener, TsListener.ChangeHrListener, @@ -175,7 +173,7 @@ public abstract class BaseSurveyNewActivity extends ColorfulActivity implements super.onCreate(savedInstanceState); Colorful.applyTheme(this); baseSurveyActivityUtils.onCreate(); - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { baseSurveyActivityUtils.activityBaseSurveyBinding.cutDownProgressbar.setBackgroundColor(ContextCompat.getColor(this, R.color.dark)); baseSurveyActivityUtils.activityBaseSurveyBinding.baseView.setBackgroundColor(ContextCompat.getColor(this, R.color.dark)); } @@ -188,7 +186,7 @@ public abstract class BaseSurveyNewActivity extends ColorfulActivity implements } } else { if (customSystemStyleNavigationBarColor() == R.color.theme_gray) { - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { Colorful.ThemeColor primaryColor = Colorful.getThemeDelegate().getPrimaryColor(); baseSurveyActivityUtils.activityBaseSurveyBinding.getRoot().setBackgroundColor(getColor(primaryColor.getColorRes())); DrawableUtils.tintModifyColorVector(baseSurveyActivityUtils.activityBaseSurveyBinding.ivBack, R.drawable.icon_system_back, R.color.white); diff --git a/app/src/main/java/com/project/survey/ui/instrument/basestationtranslation/RtkBaseCorrectActivity.java b/app/src/main/java/com/project/survey/ui/instrument/basestationtranslation/RtkBaseCorrectActivity.java index d44b228..fd2176b 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/basestationtranslation/RtkBaseCorrectActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/basestationtranslation/RtkBaseCorrectActivity.java @@ -328,7 +328,7 @@ public class RtkBaseCorrectActivity extends BaseSurveyNewActivity { } private void initMaterialEditTextColor() { - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { binding.activityRtkCorrectMetOriginalLatitude.setMetTextColor(Color.WHITE); binding.activityRtkCorrectMetOriginalLongitude.setMetTextColor(Color.WHITE); binding.activityRtkCorrectMetOriginalAltitude.setMetTextColor(Color.WHITE); @@ -388,7 +388,7 @@ public class RtkBaseCorrectActivity extends BaseSurveyNewActivity { if (Device.getInstance().isRtkRunning) { if (Gnss.getInstance().getDevice().isTiltOpen()) { if (GnssPosition.getInstance().isTiltEnable()) { - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { binding.activityRtkCorrectMetOriginalLatitude.setMetTextColor(Color.WHITE); binding.activityRtkCorrectMetOriginalLongitude.setMetTextColor(Color.WHITE); binding.activityRtkCorrectMetOriginalAltitude.setMetTextColor(Color.WHITE); @@ -405,7 +405,7 @@ public class RtkBaseCorrectActivity extends BaseSurveyNewActivity { } else { switch (GnssPosition.getInstance().getPosType()) { case GnssPosition.POS_TYPE_FIXED: - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { binding.activityRtkCorrectMetOriginalLatitude.setMetTextColor(Color.WHITE); binding.activityRtkCorrectMetOriginalLongitude.setMetTextColor(Color.WHITE); binding.activityRtkCorrectMetOriginalAltitude.setMetTextColor(Color.WHITE); diff --git a/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkMatchingPointsActivity.java b/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkMatchingPointsActivity.java index 4429661..45b9eca 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkMatchingPointsActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkMatchingPointsActivity.java @@ -95,7 +95,7 @@ public class RtkMatchingPointsActivity extends AbstractRtkMatchingPointsActivity @Override protected boolean isThemeDark() { - return ((App) Utils.getApp()).isThemeDark; + return App.instance.isThemeDark(); } @Override diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/BingCeAbstractListActivity.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/BingCeAbstractListActivity.java index 3bdd678..a0eaca5 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/BingCeAbstractListActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/BingCeAbstractListActivity.java @@ -8,6 +8,6 @@ import com.project.survey.App; public abstract class BingCeAbstractListActivity extends AbstractListActivity { @Override protected boolean isLandscape() { - return ((App) getApplication()).isLandscape(); + return App.instance.isLandscape(); } } diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/ControlPointsNewActivity.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/ControlPointsNewActivity.java index ba04f81..b33d32b 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/ControlPointsNewActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/ControlPointsNewActivity.java @@ -560,7 +560,7 @@ public class ControlPointsNewActivity extends ColorfulActivity { @Override public void onBind(final CustomDialog dialog, View v) { - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { v.setBackground(getDrawable(R.drawable.round_dark)); } tvImport = v.findViewById(R.id.tv_import); diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/CoordinatePointsLibraryActivity.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/CoordinatePointsLibraryActivity.java index d601d02..e89e610 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/CoordinatePointsLibraryActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/CoordinatePointsLibraryActivity.java @@ -146,7 +146,7 @@ public class CoordinatePointsLibraryActivity extends BaseSurveyNewActivity { protected void initView() { setTitle(getString(R.string.point_survey_point_library)); - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { binding.topLayout.setBackgroundColor(getColor(R.color.theme_dark_black)); } diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationCurrentActivity.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationCurrentActivity.java index 028a109..c5d2313 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationCurrentActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationCurrentActivity.java @@ -8,6 +8,6 @@ import blankj.utilcode.util.Utils; public class SetupStationCurrentActivity extends AbstractSetupStationCurrentActivity { @Override protected boolean isThemeDark() { - return ((App) Utils.getApp()).isThemeDark; + return App.instance.isThemeDark(); } } diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationInputActivity.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationInputActivity.java index daa07f2..13fbae9 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationInputActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationInputActivity.java @@ -35,7 +35,7 @@ public class SetupStationInputActivity extends AbstractSetupStationInputActivity @Override protected boolean isThemeDark() { - return ((App) Utils.getApp()).isThemeDark; + return App.instance.isThemeDark(); } @Override diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationKnownBackSightActivity.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationKnownBackSightActivity.java index 2545fbf..d114895 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationKnownBackSightActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationKnownBackSightActivity.java @@ -75,6 +75,6 @@ public class SetupStationKnownBackSightActivity extends AbstractSetupStationKnow @Override protected boolean isThemeDark() { - return ((App) Utils.getApp()).isThemeDark; + return App.instance.isThemeDark(); } } \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationResectionActivity.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationResectionActivity.java index 1643d49..b57406f 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationResectionActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationResectionActivity.java @@ -19,7 +19,7 @@ public class SetupStationResectionActivity extends AbstractSetupStationResection @Override protected boolean isThemeDark() { - return ((App) Utils.getApp()).isThemeDark; + return App.instance.isThemeDark(); } @Override diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationResectionSubActivity.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationResectionSubActivity.java index a638b33..8e637bd 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationResectionSubActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/SetupStationResectionSubActivity.java @@ -71,6 +71,6 @@ public class SetupStationResectionSubActivity extends AbstractSetupStationResect @Override protected boolean isThemeDark() { - return ((App) Utils.getApp()).isThemeDark; + return App.instance.isThemeDark(); } } diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/StakingNewJobActivity.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/StakingNewJobActivity.java index ac1ec8f..6df8c85 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/StakingNewJobActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/StakingNewJobActivity.java @@ -149,7 +149,7 @@ public class StakingNewJobActivity extends BaseSurveyNewActivity { protected void initView() { setTitle(getString(R.string.staking_point_library)); - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { binding.topLayout.setBackgroundColor(getColor(R.color.theme_dark_black)); binding.tvNumber.setTextColor(getColor(R.color.white)); } @@ -281,7 +281,7 @@ public class StakingNewJobActivity extends BaseSurveyNewActivity { @Override public void onBind(final com.kongzue.dialogx.dialogs.CustomDialog dialog, View v) { - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { v.setBackground(getDrawable(R.drawable.round_dark)); } tvImport = v.findViewById(R.id.tv_import); @@ -439,7 +439,7 @@ public class StakingNewJobActivity extends BaseSurveyNewActivity { } private void initMaterialEditTextColor() { - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { met_name.setMetTextColor(Color.WHITE); met_x.setMetTextColor(Color.WHITE); met_y.setMetTextColor(Color.WHITE); @@ -534,7 +534,7 @@ public class StakingNewJobActivity extends BaseSurveyNewActivity { private void selectFolder(final int intentResultNumber, final String[] filter) { ExFilePicker exFilePicker = new ExFilePicker(); - exFilePicker.setLandscape(((App) Utils.getApp()).isLandscape()); + exFilePicker.setLandscape(App.instance.isLandscape()); exFilePicker.setShowOnlyExtensions(filter); exFilePicker.start(StakingNewJobActivity.this, intentResultNumber); } diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsDetailDialogUtils.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsDetailDialogUtils.java index 5d16ce8..fed07ca 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsDetailDialogUtils.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsDetailDialogUtils.java @@ -193,7 +193,7 @@ public class ControlPointsDetailDialogUtils { } private void initMaterialEditTextColor() { - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { met_name.setMetTextColor(Color.WHITE); met_code.setMetTextColor(Color.WHITE); met_x.setMetTextColor(Color.WHITE); diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsExportDialogUtils.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsExportDialogUtils.java index 695831f..c71e2d8 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsExportDialogUtils.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsExportDialogUtils.java @@ -78,7 +78,7 @@ public class ControlPointsExportDialogUtils { } private void initMaterialEditTextColor2() { - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { met_export_name.setMetTextColor(Color.WHITE); met_export_name.setPrimaryColor(Color.LTGRAY); met_export_name.setFocusFraction(1.0f); diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsFilterDialogUtils.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsFilterDialogUtils.java index d12bb5d..6405f17 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsFilterDialogUtils.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsFilterDialogUtils.java @@ -45,7 +45,7 @@ public class ControlPointsFilterDialogUtils extends ContextProviderUtils { } private void initMaterialEditTextColor2() { - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { met_point_name_keyword.setMetTextColor(Color.WHITE); met_point_name_keyword.setPrimaryColor(Color.LTGRAY); diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsImportConfigDialogUtils.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsImportConfigDialogUtils.java index 18a01e0..a24df60 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsImportConfigDialogUtils.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/ControlPointsImportConfigDialogUtils.java @@ -214,7 +214,7 @@ public class ControlPointsImportConfigDialogUtils { private void selectFolder(final int intentResultNumber, final String[] filter) { ExFilePicker exFilePicker = new ExFilePicker(); - exFilePicker.setLandscape(((App) Utils.getApp()).isLandscape()); + exFilePicker.setLandscape(App.instance.isLandscape()); exFilePicker.setShowOnlyExtensions(filter); exFilePicker.start(context, intentResultNumber); } diff --git a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java index e63ebb6..6284df5 100644 --- a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java +++ b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java @@ -116,7 +116,7 @@ public class PointStakingActivity extends BaseSurveyNewActivity { private MoveValue moveK; private MoveValue moveD; private boolean isTsWatchRecord; - private final TargetCompassHelper targetCompassHelper = new TargetCompassHelper(this, ((App) Utils.getApp()).magneticDeclination); + private final TargetCompassHelper targetCompassHelper = new TargetCompassHelper(this, App.magneticDeclination); private final PointStakingLogic pointStakingLogic = new PointStakingLogic(() -> this); private boolean isTirpsAddSP; private CustomDialog.Builder builder; @@ -141,7 +141,7 @@ public class PointStakingActivity extends BaseSurveyNewActivity { builder = new CustomDialog.Builder(PointStakingActivity.this); initChartView(); - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { binding.layoutPoleHrHeight.tvPoleHrHeight.setTextColor(getColor(R.color.white)); binding.tvStakingPointName.setTextColor(getColor(R.color.white)); binding.tvDistance.setTextColor(getColor(R.color.white)); @@ -341,7 +341,7 @@ public class PointStakingActivity extends BaseSurveyNewActivity { List lineChartDataList = new ArrayList<>(); LineChartData lineBasePointChartData = new LineChartData(); - int blackPointColor = ((App) Utils.getApp()).isThemeDark ? getColor(R.color.color_E2E1DD) : getColor(R.color.color_575757); + int blackPointColor = App.instance.isThemeDark() ? getColor(R.color.color_E2E1DD) : getColor(R.color.color_575757); int greenPointColor = getColor(R.color.theme_green); int redPointColor = getColor(R.color.color_FF1515); int lightGreenPointColor = getColor(R.color.theme_green_press); diff --git a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/RecordsActivity.java b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/RecordsActivity.java index c7ed04e..a9ec10b 100644 --- a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/RecordsActivity.java +++ b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/RecordsActivity.java @@ -94,7 +94,7 @@ public class RecordsActivity extends ColorfulActivity { @SuppressLint("SourceLockedOrientationActivity") @Override protected void onCreate(Bundle savedInstanceState) { - if (((App) getApplication()).isLandscape()) { + if (App.instance.isLandscape()) { setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE); getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); @@ -114,7 +114,7 @@ public class RecordsActivity extends ColorfulActivity { tv_filter_other = findViewById(R.id.tv_filter_other); tv_top_date_filter.setText(R.string.record_default_display_one_week); - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { tv_filter_time.getShapeDrawableBuilder().setSolidColor(Color.GRAY).intoBackground(); tv_filter_dcs_type.getShapeDrawableBuilder().setSolidColor(Color.GRAY).intoBackground(); tv_filter_other.getShapeDrawableBuilder().setSolidColor(Color.GRAY).intoBackground(); @@ -193,7 +193,7 @@ public class RecordsActivity extends ColorfulActivity { binding.spinner1.setAdapter(mSpinnerAdapter); //设置默认记录类型 - int type = ((App) getApplication()).lastRecordBrowseType; + int type = App.instance.getLastRecordBrowseType(); Intent intent = getIntent(); if (intent != null && intent.hasExtra(KEY_TYPE)) { type = intent.getIntExtra(KEY_TYPE, 0); @@ -238,11 +238,11 @@ public class RecordsActivity extends ColorfulActivity { } updateRecyclerView(); - ((App) getApplication()).lastRecordBrowseType = currentTypeFromSpinner; + App.instance.setLastRecordBrowseType(currentTypeFromSpinner); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(RecordsActivity.this); SharedPreferences.Editor editor = prefs.edit(); - editor.putInt("lastRecordBrowseType", ((App) getApplication()).lastRecordBrowseType); + editor.putInt("lastRecordBrowseType", App.instance.getLastRecordBrowseType()); editor.apply(); } diff --git a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/util/RecordItemVH.java b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/util/RecordItemVH.java index 04a0005..b4a2673 100644 --- a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/util/RecordItemVH.java +++ b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/util/RecordItemVH.java @@ -27,7 +27,7 @@ public class RecordItemVH extends RecyclerView.ViewHolder { itemBinding.recyclerviewItemSwipeRecordBody3.setText(instance.body3); itemBinding.recyclerviewItemSwipeRecordBody4.setText(instance.body4); itemBinding.recyclerviewItemSwipeRecordBody5.setText(instance.body5); - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { itemBinding.sll.getShapeDrawableBuilder().setSolidColor(Color.GRAY).intoBackground(); }else { itemBinding.sll.getShapeDrawableBuilder().setSolidColor(Color.WHITE).intoBackground(); diff --git a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/util/RecordsActivityExportUtils.java b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/util/RecordsActivityExportUtils.java index 1c12af8..ca0509f 100644 --- a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/util/RecordsActivityExportUtils.java +++ b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/util/RecordsActivityExportUtils.java @@ -137,7 +137,7 @@ public class RecordsActivityExportUtils extends ContextProviderUtils { } private void initMaterialEditTextColor() { - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { met_export_name.setMetTextColor(Color.WHITE); met_export_name.setPrimaryColor(Color.LTGRAY); met_export_name.setFocusFraction(1.0f); diff --git a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/util/RecordsActivityFilterUtils.java b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/util/RecordsActivityFilterUtils.java index 45b1c26..8c26455 100644 --- a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/util/RecordsActivityFilterUtils.java +++ b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/record/util/RecordsActivityFilterUtils.java @@ -346,7 +346,7 @@ public class RecordsActivityFilterUtils extends ContextProviderUtils { } private void initMaterialEditTextColor2() { - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { met_roadname_keyword.setMetTextColor(Color.WHITE); met_kilometer_keyword.setMetTextColor(Color.WHITE); met_remarks_keyword.setMetTextColor(Color.WHITE); diff --git a/app/src/main/java/com/project/survey/ui/pointmeasure/measure/CodeLibraryActivity.java b/app/src/main/java/com/project/survey/ui/pointmeasure/measure/CodeLibraryActivity.java index 9de5ea4..f250ce6 100644 --- a/app/src/main/java/com/project/survey/ui/pointmeasure/measure/CodeLibraryActivity.java +++ b/app/src/main/java/com/project/survey/ui/pointmeasure/measure/CodeLibraryActivity.java @@ -60,7 +60,7 @@ public class CodeLibraryActivity extends BaseSurveyNewActivity { protected void initView() { setTitle(getString(R.string.code_library), getString(R.string.clear)); - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { binding.topLayout.setBackgroundColor(getColor(R.color.theme_dark_black)); binding.tvNumber.setTextColor(getColor(R.color.white)); binding.tvImport.setTextColor(getColor(R.color.white)); diff --git a/app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java b/app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java index db6b725..c5ea53c 100644 --- a/app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java +++ b/app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java @@ -143,7 +143,7 @@ public class PointSurveyNewActivity extends BaseSurveyNewActivity implements Vie @SuppressLint("SetTextI18n") @Override protected void initView() { - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { binding.topLayout.setBackgroundColor(getResources().getColor(R.color.theme_dark_black)); binding.layoutPoleHrHeight.tvPoleHrHeight.setTextColor(getColor(R.color.white)); binding.tvCode.setTextColor(getColor(R.color.white)); @@ -351,9 +351,9 @@ public class PointSurveyNewActivity extends BaseSurveyNewActivity implements Vie binding.tvRemark.setText(getString(R.string.have_remark)); binding.tvRemark.setTextColor(ColorUtil.getDarkColorPrimary(this)); } else { - DrawableUtils.tintModifyColorVector(binding.ivRemark, R.drawable.icon_remark_gray, ((App) Utils.getApp()).isThemeDark ? R.color.white : R.color.color_8a8a8a); + DrawableUtils.tintModifyColorVector(binding.ivRemark, R.drawable.icon_remark_gray, App.instance.isThemeDark() ? R.color.white : R.color.color_8a8a8a); binding.tvRemark.setText(getString(R.string.no_remark)); - binding.tvRemark.setTextColor(getColor(((App) Utils.getApp()).isThemeDark ? R.color.white : R.color.color_cccccc)); + binding.tvRemark.setTextColor(getColor(App.instance.isThemeDark() ? R.color.white : R.color.color_cccccc)); } }); } @@ -618,8 +618,8 @@ public class PointSurveyNewActivity extends BaseSurveyNewActivity implements Vie runOnUiThread(() -> { addDrawSurveyPoint(record); recordRemarks = ""; - DrawableUtils.tintModifyColorVector(binding.ivRemark, R.drawable.icon_remark_gray, ((App) Utils.getApp()).isThemeDark ? R.color.white : R.color.color_8a8a8a); - binding.tvRemark.setTextColor(getColor(((App) Utils.getApp()).isThemeDark ? R.color.white : R.color.color_cccccc)); + DrawableUtils.tintModifyColorVector(binding.ivRemark, R.drawable.icon_remark_gray, App.instance.isThemeDark() ? R.color.white : R.color.color_8a8a8a); + binding.tvRemark.setTextColor(getColor(App.instance.isThemeDark() ? R.color.white : R.color.color_cccccc)); binding.tvRemark.setText(getString(R.string.no_remark)); binding.etPointName.setText(Util.lastOfStringPlusStep(pointName, Device.getInstance().rtkPointNameAddStep)); }); @@ -670,7 +670,7 @@ public class PointSurveyNewActivity extends BaseSurveyNewActivity implements Vie List lineChartDataList = new ArrayList<>(); LineChartData lineBasePointChartData = new LineChartData(); - int blackPointColor = ((App) Utils.getApp()).isThemeDark ? getColor(R.color.color_E2E1DD) : getColor(R.color.color_575757); + int blackPointColor = App.instance.isThemeDark() ? getColor(R.color.color_E2E1DD) : getColor(R.color.color_575757); int redPointColor = getColor(R.color.color_FF1515); knowRecordPointLine.setCubic(false).setHasLabels(true).setHasPoints(true).setStrokeWidth(0).setHasLines(false).setPointRadius(3). setPointColor(blackPointColor).setShowLabelBackground(false).setLabelTextColor(blackPointColor); diff --git a/app/src/main/java/com/project/survey/util/DensityUtils.java b/app/src/main/java/com/project/survey/util/DensityUtils.java index 4a0a582..bb05fe7 100644 --- a/app/src/main/java/com/project/survey/util/DensityUtils.java +++ b/app/src/main/java/com/project/survey/util/DensityUtils.java @@ -190,7 +190,7 @@ public final class DensityUtils { * @return 屏幕的尺寸 */ public static Point getScreenSize(boolean isReal) { - return getDisplaySize(App.getApp(), isReal); + return getDisplaySize(App.instance, isReal); } /** @@ -262,7 +262,7 @@ public final class DensityUtils { * @return 屏幕的度量信息 */ public static DisplayMetrics getScreenMetrics(boolean isReal) { - return getDisplayMetrics(App.getApp(), isReal); + return getDisplayMetrics(App.instance, isReal); } /** diff --git a/app/src/main/java/com/project/survey/util/KeyboardUtils.java b/app/src/main/java/com/project/survey/util/KeyboardUtils.java index c7de15c..45da8d7 100644 --- a/app/src/main/java/com/project/survey/util/KeyboardUtils.java +++ b/app/src/main/java/com/project/survey/util/KeyboardUtils.java @@ -447,7 +447,7 @@ public class KeyboardUtils implements ViewTreeObserver.OnGlobalLayoutListener { */ public static void toggleSoftInput() { InputMethodManager imm = - (InputMethodManager) App.getApp().getSystemService(Context.INPUT_METHOD_SERVICE); + (InputMethodManager) App.instance.getSystemService(Context.INPUT_METHOD_SERVICE); if (imm == null) { return; } diff --git a/app/src/main/java/com/project/survey/util/ResUtils.java b/app/src/main/java/com/project/survey/util/ResUtils.java index 35deb8a..e758b4b 100644 --- a/app/src/main/java/com/project/survey/util/ResUtils.java +++ b/app/src/main/java/com/project/survey/util/ResUtils.java @@ -47,7 +47,7 @@ public final class ResUtils { */ @Deprecated public static Resources getResources() { - return App.getApp().getResources(); + return App.instance.getResources(); } /** @@ -91,7 +91,7 @@ public final class ResUtils { @Deprecated public static Drawable getDrawable(@DrawableRes int resId) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - return App.getApp().getDrawable(resId); + return App.instance.getDrawable(resId); } return getResources().getDrawable(resId); } @@ -378,7 +378,7 @@ public final class ResUtils { */ @Deprecated public static Animation getAnim(@AnimRes int resId) { - return AnimationUtils.loadAnimation(App.getApp(), resId); + return AnimationUtils.loadAnimation(App.instance, resId); } /** diff --git a/app/src/main/java/com/project/survey/util/Utils.java b/app/src/main/java/com/project/survey/util/Utils.java index 5f8b8f0..cca66cf 100644 --- a/app/src/main/java/com/project/survey/util/Utils.java +++ b/app/src/main/java/com/project/survey/util/Utils.java @@ -38,7 +38,7 @@ public class Utils { public static SimpleSQLiteQuery findRecordsListByRoadNameKRemarksDate( String DB_NAME, String projectId, String jobId, boolean ascOrder,//asc升序 des，降序 String roadName, String k, String remarks, Date start, Date end) { - if (((App) blankj.utilcode.util.Utils.getApp()).isShowAllRecordInCurrentProject) { + if (App.instance.isShowAllRecordInCurrentProject) { return DBQueryConstant.findRecordsListByProjectRoadNameKRemarksDate(DB_NAME, projectId, ascOrder, roadName, k, remarks, start, end); } else { return DBQueryConstant.findRecordsListByJobRoadNameKRemarksDate(DB_NAME, jobId, ascOrder, roadName, k, remarks, start, end); @@ -48,7 +48,7 @@ public class Utils { public static SimpleSQLiteQuery findRecordsListByRoadNameKRemarksDate( String DB_NAME, String projectId, String jobId, boolean ascOrder,//asc升序 des，降序 String roadName, String k, String remarks, Date start, Date end, String tcsType) { - if (((App) blankj.utilcode.util.Utils.getApp()).isShowAllRecordInCurrentProject) { + if (App.instance.isShowAllRecordInCurrentProject) { return DBQueryConstant.findRecordsListByProjectRoadNameKRemarksDate(DB_NAME, projectId, ascOrder, roadName, k, remarks, start, end, tcsType); } else { return DBQueryConstant.findRecordsListByJobRoadNameKRemarksDate(DB_NAME, jobId, ascOrder, roadName, k, remarks, start, end, tcsType); @@ -56,7 +56,7 @@ public class Utils { } public static SimpleSQLiteQuery findOtherRecord(String DB_NAME, String projectId, String jobId, Date date, boolean nextOrLast) { - if (((App) blankj.utilcode.util.Utils.getApp()).isShowAllRecordInCurrentProject) { + if (App.instance.isShowAllRecordInCurrentProject) { return DBQueryConstant.findOtherRecordInProject(DB_NAME, projectId, date, nextOrLast); } else { return DBQueryConstant.findOtherRecordInJob(DB_NAME, jobId, date, nextOrLast); diff --git a/app/src/main/java/com/project/survey/widget/bingce/dragdrop/FunctionAdapter.java b/app/src/main/java/com/project/survey/widget/bingce/dragdrop/FunctionAdapter.java index f40e296..0b8bcfb 100644 --- a/app/src/main/java/com/project/survey/widget/bingce/dragdrop/FunctionAdapter.java +++ b/app/src/main/java/com/project/survey/widget/bingce/dragdrop/FunctionAdapter.java @@ -53,7 +53,7 @@ public class FunctionAdapter extends RecyclerView.Adapter { TitleViewHolder holder = (TitleViewHolder) viewHolder; holder.title.setText(SFUtils.getFunctionJsonNameLanguage(context, data.get(position).name)); holder.tip.setText(SFUtils.getFunctionJsonNameLanguage(context, data.get(position).tip)); - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { holder.title.setTextColor(context.getColor(R.color.white)); holder.tip.setTextColor(context.getColor(R.color.white)); } @@ -62,7 +62,7 @@ public class FunctionAdapter extends RecyclerView.Adapter { FunctionViewHolder holder = (FunctionViewHolder) viewHolder; FunctionItem fi = data.get(position); // setImage(fi.imageUrl,holder.iv); - if (((App) Utils.getApp()).isThemeDark) { + if (App.instance.isThemeDark()) { holder.squareRelativeLayout.setBackgroundColor(context.getColor(R.color.dark)); holder.text.setTextColor(context.getColor(R.color.white)); } diff --git a/app/src/main/java/com/project/survey/widget/bingce/dragdrop/FunctionBlockAdapter.java b/app/src/main/java/com/project/survey/widget/bingce/dragdrop/FunctionBlockAdapter.java index 4bf1e1c..6263b51 100644 --- a/app/src/main/java/com/project/survey/widget/bingce/dragdrop/FunctionBlockAdapter.java +++ b/app/src/main/java/com/project/survey/widget/bingce/dragdrop/FunctionBlockAdapter.java @@ -44,7 +44,7 @@ public class FunctionBlockAdapter extends RecyclerView.Adapter