diff --git a/app/libs/appBase-release.aar b/app/libs/appBase-release.aar index d581db1..f140518 100644 Binary files a/app/libs/appBase-release.aar and b/app/libs/appBase-release.aar differ diff --git a/app/libs/base-java-release.aar b/app/libs/base-java-release.aar index be77090..562d7c8 100644 Binary files a/app/libs/base-java-release.aar and b/app/libs/base-java-release.aar differ diff --git a/app/libs/device-ui-release.aar b/app/libs/device-ui-release.aar index 0997d4c..38b3387 100644 Binary files a/app/libs/device-ui-release.aar and b/app/libs/device-ui-release.aar differ diff --git a/app/libs/rtk-release.aar b/app/libs/rtk-release.aar index 895c257..cf943b4 100644 Binary files a/app/libs/rtk-release.aar and b/app/libs/rtk-release.aar differ diff --git a/app/libs/surveyorBase-release.aar b/app/libs/surveyorBase-release.aar index ab8f814..58b085c 100644 Binary files a/app/libs/surveyorBase-release.aar and b/app/libs/surveyorBase-release.aar differ diff --git a/app/libs/utils-release.aar b/app/libs/utils-release.aar index 4c9f9c7..60e41ce 100644 Binary files a/app/libs/utils-release.aar and b/app/libs/utils-release.aar differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8247473..01c8f14 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -197,6 +197,7 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/ui/MainActivity.kt b/app/src/main/java/com/project/survey/ui/MainActivity.kt index cb26b05..84f2c3f 100644 --- a/app/src/main/java/com/project/survey/ui/MainActivity.kt +++ b/app/src/main/java/com/project/survey/ui/MainActivity.kt @@ -32,11 +32,6 @@ class MainActivity : BaseBindingActivity() { override fun getBinding(): ActivityMainBinding = ActivityMainBinding.inflate(layoutInflater) override fun initView() { - verifySdk() - initTabFragment() - } - - private fun verifySdk() { SdkUtils.verify( this, "ShangHai", @@ -50,6 +45,8 @@ class MainActivity : BaseBindingActivity() { "", "" ) + + initTabFragment() } override fun initData() { diff --git a/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt b/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt index 224a5a8..ac05d24 100644 --- a/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt @@ -35,7 +35,7 @@ class HomeFragment : BaseBindingFragment() { } //放样 binding.itemLofting.setOnClickNoRepeatListener { - LoftingListActivity.launch(requireContext()) + LoftingListActivity.launch(mContext) } binding.itemToBeProcessed.setOnClickNoRepeatListener { ApprovalActivity.launch(requireContext(), ApprovalActivity.TYPE_WAIT) diff --git a/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt b/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt index fe08959..a19a0cc 100644 --- a/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt +++ b/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt @@ -32,9 +32,7 @@ class InstrumentFragment : BaseBindingFragment() { override fun getBinding( inflater: LayoutInflater, container: ViewGroup? - ): FragmentInstrumentBinding { - return FragmentInstrumentBinding.inflate(inflater, container, false) - } + ): FragmentInstrumentBinding = FragmentInstrumentBinding.inflate(inflater, container, false) override fun initView() { @@ -47,7 +45,7 @@ class InstrumentFragment : BaseBindingFragment() { override fun initListener() { //全站仪联机 binding.itemConnectTotalStation.setOnClickNoRepeatListener { - ConnectTSActivity.start(requireContext()) + ConnectTSActivity.start(mContext) } //RTK联机 binding.itemConnectRTK.setOnClickNoRepeatListener { diff --git a/app/src/main/java/com/project/survey/ui/home/MeFragment.kt b/app/src/main/java/com/project/survey/ui/home/MeFragment.kt index 196d1a4..3391c93 100644 --- a/app/src/main/java/com/project/survey/ui/home/MeFragment.kt +++ b/app/src/main/java/com/project/survey/ui/home/MeFragment.kt @@ -5,6 +5,7 @@ import android.view.ViewGroup import androidx.activity.viewModels import androidx.fragment.app.viewModels import com.afollestad.materialdialogs.MaterialDialog +import com.project.survey.BuildConfig import com.project.survey.R import com.project.survey.constants.EventConstants import com.project.survey.constants.SPConstants @@ -31,20 +32,26 @@ class MeFragment : BaseBindingFragment() { } override fun initView() { - } override fun initData() { viewModel.msgEvent.observe(this) { binding.tvLoginOrOut.text = - if (SPUtils.getBoolean(SPConstants.LOGIN) == true) getString(R.string.login_out) else getString(R.string.login) - binding.tvName.text = if (SPUtils.getBoolean(SPConstants.LOGIN) == true) account else "请登录" + if (SPUtils.getBoolean(SPConstants.LOGIN) == true) getString(R.string.login_out) else getString( + R.string.login + ) + binding.tvName.text = + if (SPUtils.getBoolean(SPConstants.LOGIN) == true) account else "请登录" + } + + if (BuildConfig.DEBUG) { + binding.tvVersion.text = BuildConfig.VERSION_NAME } } override fun initListener() { binding.tvLoginOrOut.setOnClickNoRepeatListener { - if (SPUtils.getBoolean(SPConstants.LOGIN) == true){ + if (SPUtils.getBoolean(SPConstants.LOGIN) == true) { // 退出登录 MaterialDialog.Builder(mContext) .title("确定退出吗?") diff --git a/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkPointCorrectActivity.java b/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkPointCorrectActivity.java index 85a025a..c93eb1b 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkPointCorrectActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkPointCorrectActivity.java @@ -7,11 +7,15 @@ import android.view.MenuItem; import com.bingce.coordlib.enums.EllipsoidEnum; import com.bingce.coordlib.model.CoordinateSystem; +import com.bingce.data.database.DBQueryConstant; +import com.bingce.data.database.KeyValueDb; import com.bingce.data.database.ProjectDb; +import com.bingce.data.surveyor.designdata.project.ProjectConstants; import com.bingce.device.ui.adapter.AbstractMatchingPointRecyclerViewAdapter; import com.bingce.surveyor.agentweb.HelpWebActivity; import com.bingce.ui.coordinatesystem.BingCeCoordinateSystemActivity; import com.bingce.utils.IOnSingleGetCallback; +import com.bingce.utils.ThreadPoolUtil; import com.project.survey.R; import com.project.survey.ui.instrument.mobilestationmode.adapter.MatchingPointRecyclerViewAdapter; @@ -23,19 +27,19 @@ public class RtkPointCorrectActivity extends AbstractRtkPointCorrectActivity { @Override protected void observeCurrentCoordinate(IOnSingleGetCallback callback) { // TODO: 2024/8/15 获取坐标系 -// ThreadPoolUtil.execute(() -> { -// String currentProjectId = KeyValueDb.currentProjectId(); -// runOnUiThread(() -> { -// ProjectDb.getInstance().rawQueryLiveData( -// DBQueryConstant.findById(ProjectConstants.DB_NAME, currentProjectId)) -// .observe(this, projectRecord -> { -// if (projectRecord == null) { -// return; -// } -// callback.onGet(projectRecord.coordinateSystem); -// }); -// }); -// }); + ThreadPoolUtil.execute(() -> { + String currentProjectId = KeyValueDb.currentProjectId(); + runOnUiThread(() -> { + ProjectDb.getInstance().rawQueryLiveData( + DBQueryConstant.findById(ProjectConstants.DB_NAME, currentProjectId)) + .observe(this, projectRecord -> { + if (projectRecord == null) { + return; + } + callback.onGet(projectRecord.coordinateSystem); + }); + }); + }); CoordinateSystem coordinateSystem = new CoordinateSystem("2000"); coordinateSystem.setEllipsoid(EllipsoidEnum.AGD_84); diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/ResultsTheExportActivity.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/ResultsTheExportActivity.java index 2c3a2fe..9aead87 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/ResultsTheExportActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/ResultsTheExportActivity.java @@ -15,6 +15,7 @@ import com.bingce.coordlib.model.CoordinateSystem; import com.bingce.data.cache.CachedCurrentCoordinateSystem; import com.bingce.data.cache.CachedCurrentJob; import com.bingce.data.cache.CachedProject; +import com.bingce.data.cache.CachedProjectKt; import com.bingce.data.database.PointDb; import com.bingce.data.surveyor.surveydata.pointsurvey.PointConstants; import com.bingce.data.surveyor.surveydata.pointsurvey.PointRecord; @@ -62,7 +63,7 @@ public class ResultsTheExportActivity extends BaseSurveyNewActivity { private boolean isImport; private List fileTypeSuffixList; private String txtContent = ""; - private final CachedProject currentProject = new CachedProject(this); + private final CachedProjectKt currentProject = new CachedProjectKt(this); @Override public View getContentView() { 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 eecce19..ac1ec8f 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 @@ -557,16 +557,15 @@ public class StakingNewJobActivity extends BaseSurveyNewActivity { String result = null; switch (requestCode) { case EX_FILE_PICKER_RESULT_SURVEYOR_EXCEL: - result = PointLibraryUtil.importStakingJobPointExcel(new File(path), projectId, jobId, isOverrideImport); + PointLibraryUtil.importStakingJobPointExcel(new File(path), projectId, jobId, isOverrideImport, (status, msg) -> ToastUtils.showShort(msg)); break; case EX_FILE_PICKER_RESULT_SURVEYOR_TXT: - result = PointLibraryUtil.importStakingJobPointTxt(new File(path), projectId, jobId, isOverrideImport); + PointLibraryUtil.importStakingJobPointTxt(new File(path), projectId, jobId, isOverrideImport, (status, msg) -> ToastUtils.showShort(msg)); break; case EX_FILE_PICKER_RESULT_CASS_DAT: - result = PointLibraryUtil.importStakingJobPointCassDat(new File(path), projectId, jobId, isOverrideImport, cassXY); + PointLibraryUtil.importStakingJobPointCassDat(new File(path), projectId, jobId, isOverrideImport, cassXY, (status, msg) -> ToastUtils.showShort(msg)); break; } - if (result != null) ToastUtils.showShort(result); } catch (Exception e) { Log.e("StakingNewJobActivity", "File select error", e); } diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/JobDbUtils.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/JobDbUtils.java index 97b9e82..5e154f1 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/JobDbUtils.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/JobDbUtils.java @@ -116,7 +116,7 @@ public class JobDbUtils { line = 0; List> sheetResult = importResult.get(i); if (sheetResult == null || sheetResult.isEmpty()) { - if (AppUtil.isZh()) { + if (AppUtil.isZhCN()) { return stakingFile.getAbsolutePath() + "，导入失败，原因：导入excel为空"; } else { result = stakingFile.getAbsolutePath() + "," + StringUtils.getString(R.string.import_failed); @@ -132,7 +132,7 @@ public class JobDbUtils { continue; } if (row.size() != 8) { - if (AppUtil.isZh()) { + if (AppUtil.isZhCN()) { result = stakingFile.getAbsolutePath() + "/" + sheetName + "，导入失败，原因：第" + line + "行，元素个数必须为8"; } else { result = stakingFile.getAbsolutePath() + "," + StringUtils.getString(R.string.import_failed); @@ -148,7 +148,7 @@ public class JobDbUtils { result = stakingFile.getAbsolutePath() + "," + "," + StringUtils.getString(R.string.import_success); } } catch (NumberFormatException ex) { - if (AppUtil.isZh()) { + if (AppUtil.isZhCN()) { result = stakingFile.getAbsolutePath() + "，导入失败，原因：第" + line + "行，发现非数字字符串"; } else { result = stakingFile.getAbsolutePath() + "," + StringUtils.getString(R.string.import_failed); diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/_6GlobalControlPointCollectUtils.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/_6GlobalControlPointCollectUtils.java index 16ef72a..3c72ac2 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/_6GlobalControlPointCollectUtils.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/util/_6GlobalControlPointCollectUtils.java @@ -89,7 +89,7 @@ public class _6GlobalControlPointCollectUtils { try { List> importResult = ExcelReadHelper.excelRead(file, ExcelReadHelper.FIRST_ROW_NOT_IGNORE); if (importResult == null || importResult.isEmpty()) { - if (AppUtil.isZh()) { + if (AppUtil.isZhCN()) { return Result.failure(file.getAbsolutePath() + "，导入失败，原因：导入excel为空"); } else { return Result.failure(file.getAbsolutePath() + "," + StringUtils.getString(R.string.import_failed)); @@ -121,14 +121,14 @@ public class _6GlobalControlPointCollectUtils { } } catch (NumberFormatException ex) { pointArray.clear(); - if (AppUtil.isZh()) { + if (AppUtil.isZhCN()) { return Result.failure(file.getAbsolutePath() + "，导入失败，原因：第" + line + "行，发现非数字字符串"); } else { return Result.failure(file.getAbsolutePath() + "," + StringUtils.getString(R.string.import_failed)); } } catch (Exception ex) { ex.printStackTrace(); - if (AppUtil.isZh()) { + if (AppUtil.isZhCN()) { return Result.failure(file.getAbsolutePath() + "，导入失败，原因：第" + line + "行:" + ex.getMessage()); } else { return Result.failure(file.getAbsolutePath() + "," + StringUtils.getString(R.string.import_failed)); @@ -158,7 +158,7 @@ public class _6GlobalControlPointCollectUtils { a = a.replaceAll("(^[\u0020\u0009\u3000]*)|([\u0020\u0009\u3000]*$)", "");// 删除首尾空格、制表及全角空格 String[] arr = a.split(",|，", -2); if (arr.length < 4) { - if (AppUtil.isZh()) { + if (AppUtil.isZhCN()) { return Result.failure(file.getAbsolutePath() + "，导入失败，原因：第" + line + "行，元素个数不能少于4个"); } else { return Result.failure(file.getAbsolutePath() + "," + StringUtils.getString(R.string.import_failed)); @@ -182,7 +182,7 @@ public class _6GlobalControlPointCollectUtils { // result = file.getAbsolutePath() + "，导入成功"; // } } catch (NumberFormatException ex) { - if (AppUtil.isZh()) { + if (AppUtil.isZhCN()) { return Result.failure(file.getAbsolutePath() + "，导入失败，原因：第" + line + "行，发现非数字字符串"); } else { return Result.failure(file.getAbsolutePath() + "," + StringUtils.getString(R.string.import_failed)); @@ -271,7 +271,7 @@ public class _6GlobalControlPointCollectUtils { a = a.replaceAll("(^[\u0020\u0009\u3000]*)|([\u0020\u0009\u3000]*$)", "");// 删除首尾空格、制表及全角空格 String[] arr = a.split(",|，", -2); if (arr.length != 5) { - if (AppUtil.isZh()) { + if (AppUtil.isZhCN()) { return Result.failure(file.getAbsolutePath() + "，导入失败，原因：第" + line + "行，元素个数不等于5个"); } else { return Result.failure(file.getAbsolutePath() + "," + StringUtils.getString(R.string.import_failed)); @@ -284,7 +284,7 @@ public class _6GlobalControlPointCollectUtils { } } } catch (NumberFormatException ex) { - if (AppUtil.isZh()) { + if (AppUtil.isZhCN()) { return Result.failure(file.getAbsolutePath() + "，导入失败，原因：第\" + line + \"行，发现非数字字符串"); } else { return Result.failure(file.getAbsolutePath() + "," + StringUtils.getString(R.string.import_failed)); 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 70ece01..e63ebb6 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 @@ -26,6 +26,7 @@ import com.bingce.coordlib.util.CoordUtil; import com.bingce.data.DeviceInfoData; import com.bingce.data.cache.CachedCurrentJob; import com.bingce.data.cache.CachedCurrentRoad; +import com.bingce.data.cache.CachedCurrentRoadKt; import com.bingce.data.cache.CachedProject; import com.bingce.data.database.DBQueryConstant; import com.bingce.data.database.PointDb; @@ -109,7 +110,7 @@ public class PointStakingActivity extends BaseSurveyNewActivity { private PointRecord targetStakePointRecord; private Coordinate currentCoordinate; private Coordinate currentSmoothCoordinate; - protected final CachedCurrentRoad cachedRoad = new CachedCurrentRoad(this); + protected final CachedCurrentRoadKt cachedRoadKt = new CachedCurrentRoadKt(this); private final SurveyRemarksUtils surveyRemarksUtils = new SurveyRemarksUtils(); private IText distance, moveWestEast, moveSouthNorth, moveDigFill, moveLeftRight, moveBeforeAfter; private MoveValue moveK; @@ -793,11 +794,11 @@ public class PointStakingActivity extends BaseSurveyNewActivity { } } - if (!cachedRoad.isDataReady()) { + if (!cachedRoadKt.isDataReady()) { return; } - PointStakingLogic.Result result = pointStakingLogic.calculate(cachedRoad.roadEditor(), + PointStakingLogic.Result result = pointStakingLogic.calculate(cachedRoadKt.roadEditor(), new PointStakingLogic.Configs(6, moveType), new PointStakingLogic.Parameter( new MeasuredPoint(currentCoordinate.getX(), currentCoordinate.getY(), currentCoordinate.getZ(), currentCoordinate.getName()), @@ -1046,7 +1047,7 @@ public class PointStakingActivity extends BaseSurveyNewActivity { DeviceInfoData deviceInfoData = DeviceUtils.collectDeviceInfo(); PointStakeRecord pointStakeRecord = new PointStakeRecord(projectId, jobId, roadId, targetStakePointRecord.id, moveBeforeAfter != null ? moveBeforeAfter.getString() : "", moveLeftRight != null ? moveLeftRight.getString() : "", moveWestEast != null ? moveWestEast.getString() : "", moveSouthNorth != null ? moveSouthNorth.getString() : "", - cachedRoad.road().getName() + cachedRoadKt.road().getName() , targetStakePointRecord.name , Util.formatDouble2StringDotAuto(targetStakePointRecord.x) , Util.formatDouble2StringDotAuto(targetStakePointRecord.y) diff --git a/app/src/main/java/com/project/survey/util/CassCsvTxtExportUtil.java b/app/src/main/java/com/project/survey/util/CassCsvTxtExportUtil.java index ff2b6d4..ea53263 100644 --- a/app/src/main/java/com/project/survey/util/CassCsvTxtExportUtil.java +++ b/app/src/main/java/com/project/survey/util/CassCsvTxtExportUtil.java @@ -4,6 +4,7 @@ import android.content.Context; import com.bingce.coordlib.model.CoordinateSystem; import com.bingce.data.cache.CachedProject; +import com.bingce.data.cache.CachedProjectKt; import com.bingce.surveyor.util.dialog.CustomInputDialog; import com.bingce.utils.FileUtil; import com.bingce.utils.StringUtil; @@ -26,7 +27,7 @@ import blankj.utilcode.util.Utils; public class CassCsvTxtExportUtil { - public static void exportFormat(Context activity, String suffixesUtils, CachedProject currentProject, FormatRecord formatRecord, List pointSurveyRecords, CoordinateSystem coordinateSystem) { + public static void exportFormat(Context activity, String suffixesUtils, CachedProjectKt currentProject, FormatRecord formatRecord, List pointSurveyRecords, CoordinateSystem coordinateSystem) { List regexFormatRecordList = new ArrayList<>(); String[] split = formatRecord.format_content.split(formatRecord.divided_symbols); @@ -46,7 +47,7 @@ public class CassCsvTxtExportUtil { */ private static String title; - private static void exportCassFile(Context context, CachedProject currentProject, String suffixesUtils, FormatRecord formatRecord, List regexList, List pointSurveyRecordList, CoordinateSystem coordinateSystem) { + private static void exportCassFile(Context context, CachedProjectKt currentProject, String suffixesUtils, FormatRecord formatRecord, List regexList, List pointSurveyRecordList, CoordinateSystem coordinateSystem) { if (Objects.equals(suffixesUtils, FormatSuffixesUtils.formatDAT)) { title = context.getString(R.string.export_cass_file_name); } else if (Objects.equals(suffixesUtils, FormatSuffixesUtils.formatTXT)) { diff --git a/app/src/main/java/com/project/survey/util/DxfUtil.java b/app/src/main/java/com/project/survey/util/DxfUtil.java index 3848e95..a7c8c69 100644 --- a/app/src/main/java/com/project/survey/util/DxfUtil.java +++ b/app/src/main/java/com/project/survey/util/DxfUtil.java @@ -6,6 +6,7 @@ import android.text.TextUtils; import androidx.annotation.MainThread; import com.bingce.data.cache.CachedProject; +import com.bingce.data.cache.CachedProjectKt; import com.bingce.file.FileOperator; import com.bingce.surveyor.util.dialog.CustomDialog; import com.bingce.surveyor.util.dialog.CustomInputDialog; @@ -40,11 +41,11 @@ public class DxfUtil { */ private static List pointSurveyRecordLists; - public static void exportFormat(Context context, CachedProject currentProject) { + public static void exportFormat(Context context, CachedProjectKt currentProject) { exportFormat(context, currentProject, null); } - public static void exportFormat(Context context, CachedProject currentProject, List pointSurveyRecordList) { + public static void exportFormat(Context context, CachedProjectKt currentProject, List pointSurveyRecordList) { if (pointSurveyRecordList != null) { pointSurveyRecordLists = pointSurveyRecordList; } diff --git a/app/src/main/java/com/project/survey/util/ExcelUtil.java b/app/src/main/java/com/project/survey/util/ExcelUtil.java index 3fa3e5f..3450d46 100644 --- a/app/src/main/java/com/project/survey/util/ExcelUtil.java +++ b/app/src/main/java/com/project/survey/util/ExcelUtil.java @@ -9,6 +9,7 @@ import androidx.annotation.MainThread; import androidx.annotation.WorkerThread; import com.bingce.data.cache.CachedProject; +import com.bingce.data.cache.CachedProjectKt; import com.bingce.file.FileOperator; import com.bingce.surveyor.util.dialog.CustomDialog; import com.bingce.surveyor.util.dialog.CustomInputDialog; @@ -144,11 +145,11 @@ public class ExcelUtil { /** * 导出Excel文件调用此方法 */ - public static void exportFormat(int ID_TYPE, Context context, CachedProject currentProject, IExportExcel exportExcel) { + public static void exportFormat(int ID_TYPE, Context context, CachedProjectKt currentProject, IExportExcel exportExcel) { exportFormat(ID_TYPE, context, currentProject, null, exportExcel); } - public static void exportFormat(int ID_TYPE, Context context, CachedProject currentProject, FormatRecord formatRecord, IExportExcel exportExcel) { + public static void exportFormat(int ID_TYPE, Context context, CachedProjectKt currentProject, FormatRecord formatRecord, IExportExcel exportExcel) { if (XXPermissions.isGranted(context, Permission.MANAGE_EXTERNAL_STORAGE)) { showEditTextDialog(ID_TYPE, context, currentProject, formatRecord, exportExcel); } else { @@ -158,7 +159,7 @@ public class ExcelUtil { private static CustomInputDialog.Builder inputBuilder; - private static void showEditTextDialog(int ID_TYPE, Context context, CachedProject currentProject, FormatRecord formatRecord, IExportExcel exportExcel) { + private static void showEditTextDialog(int ID_TYPE, Context context, CachedProjectKt currentProject, FormatRecord formatRecord, IExportExcel exportExcel) { inputBuilder = new CustomInputDialog.Builder(context); inputBuilder.setTitle(context.getString(R.string.export_excel_file_name)).setInputHint(context.getString(R.string.file_name)).setButtonConfirm(new CustomInputDialog.setOnConfirmClickListener() { @Override @@ -181,7 +182,7 @@ public class ExcelUtil { */ private static String sheetName, filePaths; - private static void setExcelInformation(int ID_TYPE, String inputFileName, Context context, CachedProject currentProject, FormatRecord formatRecord, IExportExcel exportExcel) { + private static void setExcelInformation(int ID_TYPE, String inputFileName, Context context, CachedProjectKt currentProject, FormatRecord formatRecord, IExportExcel exportExcel) { filePaths = FileUtil.getSDPath() + "/" + context.getString(R.string.surveyor_exported_file) + "/" + context.getString(R.string.point_survey) + "/" + inputFileName + ".xls"; switch (ID_TYPE) { case ID_POINT_COORDINATE: diff --git a/app/src/main/java/com/project/survey/util/TxtUtil.java b/app/src/main/java/com/project/survey/util/TxtUtil.java index 1d56578..9bc16e7 100644 --- a/app/src/main/java/com/project/survey/util/TxtUtil.java +++ b/app/src/main/java/com/project/survey/util/TxtUtil.java @@ -9,6 +9,7 @@ import androidx.annotation.NonNull; import androidx.core.content.PermissionChecker; import com.bingce.data.cache.CachedProject; +import com.bingce.data.cache.CachedProjectKt; import com.bingce.file.FileOperator; import com.bingce.surveyor.util.dialog.CustomDialog; import com.bingce.surveyor.util.dialog.CustomInputDialog; @@ -27,7 +28,7 @@ import blankj.utilcode.util.ToastUtils; public class TxtUtil { - public static void exportFormat(Context context, String strContent, String format_suffixes, CachedProject currentProject) { + public static void exportFormat(Context context, String strContent, String format_suffixes, CachedProjectKt currentProject) { exportFormat(context, "", strContent, format_suffixes, currentProject, false); } @@ -39,7 +40,7 @@ public class TxtUtil { * @param format_suffixes 格式后缀 * @param isFinish 是否关闭当前页面 */ - public static void exportFormat(Context context, String fileName, String strContent, String format_suffixes, CachedProject currentProject, boolean isFinish) { + public static void exportFormat(Context context, String fileName, String strContent, String format_suffixes, CachedProjectKt currentProject, boolean isFinish) { if (XXPermissions.isGranted(context, Permission.MANAGE_EXTERNAL_STORAGE)) { agreePermission(context, fileName, strContent, format_suffixes, currentProject, isFinish); } else { @@ -56,7 +57,7 @@ public class TxtUtil { * @param format_suffixes * @param currentProject */ - private static void agreePermission(Context context, String fileName, String strContent, String format_suffixes, CachedProject currentProject, boolean isFinish) { + private static void agreePermission(Context context, String fileName, String strContent, String format_suffixes, CachedProjectKt currentProject, boolean isFinish) { //单独列出导出Html(当结尾和文件名都传过来时，无需弹出编辑文件名弹框。当没传过来的文件名，和正常的编辑文件名一样弹出编辑弹框) if (format_suffixes.equals(FormatSuffixesUtils.formatHTML) && !TextUtils.isEmpty(fileName)) { if (isCheckExistFile(FileUtil.getSDPath() + "/" + context.getString(R.string.surveyor_exported_file) + "/" + context.getString(R.string.point_survey) + "/" + format_suffixes)) { diff --git a/app/src/main/res/layout/activity_approval.xml b/app/src/main/res/layout/activity_approval.xml index 5250350..ce108c0 100644 --- a/app/src/main/res/layout/activity_approval.xml +++ b/app/src/main/res/layout/activity_approval.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_base_binding.xml b/app/src/main/res/layout/activity_base_binding.xml index dce2a21..71c936e 100644 --- a/app/src/main/res/layout/activity_base_binding.xml +++ b/app/src/main/res/layout/activity_base_binding.xml @@ -7,6 +7,6 @@ + layout="@layout/sh_toolbar" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_control_net_list.xml b/app/src/main/res/layout/activity_control_net_list.xml index 849a2b1..e609d7c 100644 --- a/app/src/main/res/layout/activity_control_net_list.xml +++ b/app/src/main/res/layout/activity_control_net_list.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + diff --git a/app/src/main/res/layout/activity_login_input_code.xml b/app/src/main/res/layout/activity_login_input_code.xml index 5d2a6ab..5d91f6e 100644 --- a/app/src/main/res/layout/activity_login_input_code.xml +++ b/app/src/main/res/layout/activity_login_input_code.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + diff --git a/app/src/main/res/layout/activity_project_list.xml b/app/src/main/res/layout/activity_project_list.xml index d8d1bb7..4b65761 100644 --- a/app/src/main/res/layout/activity_project_list.xml +++ b/app/src/main/res/layout/activity_project_list.xml @@ -7,7 +7,7 @@ + layout="@layout/sh_toolbar" /> diff --git a/app/src/main/res/layout/activity_rtk_base_setting.xml b/app/src/main/res/layout/activity_rtk_base_setting.xml index a7038d4..2f5b741 100644 --- a/app/src/main/res/layout/activity_rtk_base_setting.xml +++ b/app/src/main/res/layout/activity_rtk_base_setting.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + + + \ No newline at end of file diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/sh_toolbar.xml similarity index 100% rename from app/src/main/res/layout/toolbar.xml rename to app/src/main/res/layout/sh_toolbar.xml