[improvement]更新部分aar，解决仪器、放样的一级或多级页面跳转崩溃等问题；

8 months ago · cb265b6cf2
parent d22f5257c7
commit cb265b6cf2
37 changed files with 126 additions and 71 deletions
--- a/app/libs/appBase-release.aar
+++ b/app/libs/appBase-release.aar
--- a/app/libs/base-java-release.aar
+++ b/app/libs/base-java-release.aar
--- a/app/libs/device-ui-release.aar
+++ b/app/libs/device-ui-release.aar
--- a/app/libs/rtk-release.aar
+++ b/app/libs/rtk-release.aar
--- a/app/libs/surveyorBase-release.aar
+++ b/app/libs/surveyorBase-release.aar
--- a/app/libs/utils-release.aar
+++ b/app/libs/utils-release.aar
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -197,6 +197,7 @@
        <activity
            android:name=".ui.instrument.coordinatesystem.BingCeCoordinateSystemActivity"
            android:exported="true"
+            android:label="@string/coordinate_system"
            android:windowSoftInputMode="adjustResize|stateHidden" />
        <activity
            android:name=".ui.instrument.mobilestationmode.base.RtkMatchingPointsActivity"
@ -206,10 +207,47 @@
            android:name=".ui.pointmeasure.measure.PointSurveyNewActivity"
            android:exported="true"
            android:windowSoftInputMode="adjustResize|stateHidden" />
+        <activity
+            android:name=".ui.pointmeasure.measure.PointSurveySettingActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:label="@string/rtk_survey"
+            android:windowSoftInputMode="adjustPan|stateHidden" />
        <activity
            android:name=".ui.lofting.pointlofting.record.RecordsActivity"
            android:exported="true"
            android:windowSoftInputMode="adjustResize|stateHidden" />
+        <activity
+            android:name=".ui.pointmeasure.measure.CodeLibraryActivity"
+            android:exported="false">
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="" />
+        </activity>
+        <activity
+            android:name=".ui.pointmeasure.measure.PickerColorActivity"
+            android:exported="false">
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="" />
+        </activity>
+        <activity
+            android:name=".ui.pointmeasure.measure.AddCodeActivity"
+            android:exported="false">
+            <meta-data
+                android:value="" />
+        </activity>
+        <activity
+            android:name=".ui.pointmeasure.measure.CodeModelLibraryActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.pointmeasure.measure.CodeStylePointLineActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.pointmeasure.measure.CodeStyleSurfaceActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.pointmeasure.measure.ControlRecordListActivity"
+            android:exported="false" />
    </application>

 </manifest>
--- 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<ActivityMainBinding>() {
    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<ActivityMainBinding>() {
            "",
            ""
        )
+
+        initTabFragment()
    }

    override fun initData() {
--- 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<FragmentHomeBinding>() {
        }
        //放样
        binding.itemLofting.setOnClickNoRepeatListener {
-            LoftingListActivity.launch(requireContext())
+            LoftingListActivity.launch(mContext)
        }
        binding.itemToBeProcessed.setOnClickNoRepeatListener {
            ApprovalActivity.launch(requireContext(), ApprovalActivity.TYPE_WAIT)
--- 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<FragmentInstrumentBinding>() {
    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<FragmentInstrumentBinding>() {
    override fun initListener() {
        //全站仪联机
        binding.itemConnectTotalStation.setOnClickNoRepeatListener {
-            ConnectTSActivity.start(requireContext())
+            ConnectTSActivity.start(mContext)
        }
        //RTK联机
        binding.itemConnectRTK.setOnClickNoRepeatListener {
--- 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<FragmentMeBinding>() {
    }

    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("确定退出吗?")
--- 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<CoordinateSystem> 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);
--- 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<String> fileTypeSuffixList;
    private String txtContent = "";
-    private final CachedProject currentProject = new CachedProject(this);
+    private final CachedProjectKt currentProject = new CachedProjectKt(this);

    @Override
    public View getContentView() {
--- 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);
                        }
--- 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<List<String>> 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);
--- 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<List<String>> 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));
--- 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> 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)
--- 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<PointSurveyRecord> pointSurveyRecords, CoordinateSystem coordinateSystem) {
+    public static void exportFormat(Context activity, String suffixesUtils, CachedProjectKt currentProject, FormatRecord formatRecord, List<PointSurveyRecord> pointSurveyRecords, CoordinateSystem coordinateSystem) {

        List<String> 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<String> regexList, List<PointSurveyRecord> pointSurveyRecordList, CoordinateSystem coordinateSystem) {
+    private static void exportCassFile(Context context, CachedProjectKt currentProject, String suffixesUtils, FormatRecord formatRecord, List<String> regexList, List<PointSurveyRecord> 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)) {
--- 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<PointSurveyRecord> 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<PointSurveyRecord> pointSurveyRecordList) {
+    public static void exportFormat(Context context, CachedProjectKt currentProject, List<PointSurveyRecord> pointSurveyRecordList) {
        if (pointSurveyRecordList != null) {
            pointSurveyRecordLists = pointSurveyRecordList;
        }
--- 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 <T> void setExcelInformation(int ID_TYPE, String inputFileName, Context context, CachedProject currentProject, FormatRecord formatRecord, IExportExcel exportExcel) {
+    private static <T> 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:
--- 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)) {
--- 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">

-    <include layout="@layout/toolbar" />
+    <include layout="@layout/sh_toolbar" />

    <include layout="@layout/item_search" />

--- a/app/src/main/res/layout/activity_base_binding.xml
+++ b/app/src/main/res/layout/activity_base_binding.xml
@ -7,6 +7,6 @@

    <include
        android:id="@+id/ilToolBar"
-        layout="@layout/toolbar" />
+        layout="@layout/sh_toolbar" />

 </LinearLayout>
--- 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">

-    <include layout="@layout/toolbar" />
+    <include layout="@layout/sh_toolbar" />

    <include
        android:id="@+id/ilSearch"
--- a/app/src/main/res/layout/activity_forget_pwd.xml
+++ b/app/src/main/res/layout/activity_forget_pwd.xml
@ -4,7 +4,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

-    <include layout="@layout/toolbar" />
+    <include layout="@layout/sh_toolbar" />

    <TextView
        android:layout_width="wrap_content"
--- a/app/src/main/res/layout/activity_forget_pwd_input_code.xml
+++ b/app/src/main/res/layout/activity_forget_pwd_input_code.xml
@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

-    <include layout="@layout/toolbar" />
+    <include layout="@layout/sh_toolbar" />

    <TextView
        android:id="@+id/tvAccountDesc"
--- a/app/src/main/res/layout/activity_lofting_list.xml
+++ b/app/src/main/res/layout/activity_lofting_list.xml
@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

-    <include layout="@layout/toolbar" />
+    <include layout="@layout/sh_toolbar" />

    <include layout="@layout/item_search" />

--- 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">

-    <include layout="@layout/toolbar" />
+    <include layout="@layout/sh_toolbar" />

    <TextView
        android:id="@+id/tvAccountDesc"
--- a/app/src/main/res/layout/activity_point_measure_list.xml
+++ b/app/src/main/res/layout/activity_point_measure_list.xml
@ -4,7 +4,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

-    <include layout="@layout/toolbar" />
+    <include layout="@layout/sh_toolbar" />

    <include layout="@layout/item_search" />

--- a/app/src/main/res/layout/activity_project_list.xml
+++ b/app/src/main/res/layout/activity_project_list.xml
@ -7,7 +7,7 @@

    <include
        android:id="@+id/ilToolBar"
-        layout="@layout/toolbar" />
+        layout="@layout/sh_toolbar" />

    <include layout="@layout/item_search" />

--- 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">

-    <include layout="@layout/toolbar" />
+    <include layout="@layout/sh_toolbar" />

    <FrameLayout
        android:id="@+id/activity_rtk_base_setting_fragment"
--- a/app/src/main/res/layout/activity_rtk_rover_setting.xml
+++ b/app/src/main/res/layout/activity_rtk_rover_setting.xml
@ -4,7 +4,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

-    <include layout="@layout/toolbar" />
+    <include layout="@layout/sh_toolbar" />

    <FrameLayout
        android:id="@+id/activity_rtk_rover_setting_fragment"
--- a/app/src/main/res/layout/activity_rtk_static_setting.xml
+++ b/app/src/main/res/layout/activity_rtk_static_setting.xml
@ -4,7 +4,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

-    <include layout="@layout/toolbar" />
+    <include layout="@layout/sh_toolbar" />

    <FrameLayout
        android:id="@+id/activity_rtk_static_setting_fragment"
--- a/app/src/main/res/layout/activity_satellite_system_switch.xml
+++ b/app/src/main/res/layout/activity_satellite_system_switch.xml
@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

-    <include layout="@layout/toolbar" />
+    <include layout="@layout/sh_toolbar" />

    <ScrollView
        android:layout_width="match_parent"
--- a/app/src/main/res/layout/activity_set_new_pwd.xml
+++ b/app/src/main/res/layout/activity_set_new_pwd.xml
@ -4,7 +4,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

-    <include layout="@layout/toolbar" />
+    <include layout="@layout/sh_toolbar" />

    <LinearLayout
        android:layout_width="match_parent"
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@ -148,5 +148,11 @@
        android:textColor="@color/text_color_20"
        android:textSize="15sp" />

+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tvVersion"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text="1.0.0"/>
+

 </LinearLayout>
--- a/app/src/main/res/layout/sh_toolbar.xml
+++ b/app/src/main/res/layout/sh_toolbar.xml