From d200dde9d382dbee89193d050910a3e99de613bf Mon Sep 17 00:00:00 2001 From: huangwei <983142558@qq.com> Date: Sat, 27 Jul 2024 17:20:05 +0800 Subject: [PATCH] bug --- .../com/bingce/controlnetwork/activity/AboutActivity.java | 2 +- .../java/com/bingce/controlnetwork/activity/MainActivity.java | 2 +- .../controlnetwork/func/level/constant/LevelConstant.kt | 2 +- .../controlnetwork/func/level/export/LevelExportIDetection.kt | 2 +- .../func/level/fragment/LevelRouteCreateEditFragment.kt | 2 +- .../func/level/fragment/LevelSurveyFragment.java | 2 +- .../func/level/idetection/LevelIDetectionRecordActivity.kt | 2 +- .../controlnetwork/func/level/sendreceive/LevelRequest.kt | 1 - .../func/level/sendreceive/LevelRequestRelease.kt | 4 +--- .../func/level/sendreceive/LevelRequestState.kt | 2 +- .../controlnetwork/func/level/util/LevelExportUtilTj.kt | 2 +- .../newui/projectedit/ProjectCreateEditLevelFragment.kt | 2 +- 12 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/bingce/controlnetwork/activity/AboutActivity.java b/app/src/main/java/com/bingce/controlnetwork/activity/AboutActivity.java index b36b276..2cec97e 100644 --- a/app/src/main/java/com/bingce/controlnetwork/activity/AboutActivity.java +++ b/app/src/main/java/com/bingce/controlnetwork/activity/AboutActivity.java @@ -95,7 +95,7 @@ public class AboutActivity extends ColorfulActivity { .addAction(R.mipmap.icon_download_fill, R.string.check_update, new View.OnClickListener() { @Override public void onClick(View view) { - CheckControlUpdateUtil.checkUpdate(AboutActivity.this, true); +// CheckControlUpdateUtil.checkUpdate(AboutActivity.this, true); } }) .addAction(R.drawable.icon_log, R.string.log_collect_activity, v -> LogCollectActivity.start(AboutActivity.this)) diff --git a/app/src/main/java/com/bingce/controlnetwork/activity/MainActivity.java b/app/src/main/java/com/bingce/controlnetwork/activity/MainActivity.java index a9696ca..a3d2d61 100644 --- a/app/src/main/java/com/bingce/controlnetwork/activity/MainActivity.java +++ b/app/src/main/java/com/bingce/controlnetwork/activity/MainActivity.java @@ -510,7 +510,7 @@ public class MainActivity extends BaseMainActivity implements Device.IDeviceConn } } catch (Exception ignored) { } - CheckControlUpdateUtil.checkUpdate(this, false); +// CheckControlUpdateUtil.checkUpdate(this, false); EventBus.getDefault().post(new DatabaseReadyEvent()); if (LCUser.getCurrentUser() == null) { diff --git a/app/src/main/java/com/bingce/controlnetwork/func/level/constant/LevelConstant.kt b/app/src/main/java/com/bingce/controlnetwork/func/level/constant/LevelConstant.kt index eda529e..5b84f2e 100644 --- a/app/src/main/java/com/bingce/controlnetwork/func/level/constant/LevelConstant.kt +++ b/app/src/main/java/com/bingce/controlnetwork/func/level/constant/LevelConstant.kt @@ -1,4 +1,4 @@ -package cn.liuyanbing.surveyor.function.level.constant +package com.bingce.controlnetwork.func.level.constant /** * 水准常量 diff --git a/app/src/main/java/com/bingce/controlnetwork/func/level/export/LevelExportIDetection.kt b/app/src/main/java/com/bingce/controlnetwork/func/level/export/LevelExportIDetection.kt index d715a5e..4e58355 100644 --- a/app/src/main/java/com/bingce/controlnetwork/func/level/export/LevelExportIDetection.kt +++ b/app/src/main/java/com/bingce/controlnetwork/func/level/export/LevelExportIDetection.kt @@ -1,4 +1,4 @@ -package cn.liuyanbing.surveyor.function.level.export +package com.bingce.controlnetwork.func.level.export import android.util.Log import androidx.annotation.WorkerThread diff --git a/app/src/main/java/com/bingce/controlnetwork/func/level/fragment/LevelRouteCreateEditFragment.kt b/app/src/main/java/com/bingce/controlnetwork/func/level/fragment/LevelRouteCreateEditFragment.kt index 6e8260a..0c69b8c 100644 --- a/app/src/main/java/com/bingce/controlnetwork/func/level/fragment/LevelRouteCreateEditFragment.kt +++ b/app/src/main/java/com/bingce/controlnetwork/func/level/fragment/LevelRouteCreateEditFragment.kt @@ -13,7 +13,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope import blankj.utilcode.util.ToastUtils -import cn.liuyanbing.surveyor.function.level.constant.LevelConstant +import com.bingce.controlnetwork.func.level.constant.LevelConstant import com.bingce.controlnetwork.func.level.constant.LevelStationSettingContant import com.bingce.controlnetwork.func.level.util.LevelStationSettingUtil.getSpinnerText import com.bingce.controlapphelper.model.BundleConstants diff --git a/app/src/main/java/com/bingce/controlnetwork/func/level/fragment/LevelSurveyFragment.java b/app/src/main/java/com/bingce/controlnetwork/func/level/fragment/LevelSurveyFragment.java index f50967c..1ea0265 100644 --- a/app/src/main/java/com/bingce/controlnetwork/func/level/fragment/LevelSurveyFragment.java +++ b/app/src/main/java/com/bingce/controlnetwork/func/level/fragment/LevelSurveyFragment.java @@ -44,7 +44,7 @@ import java.util.List; import blankj.utilcode.util.ToastUtils; import com.bingce.controlnetwork.func.level.sendreceive.ILevelBackData; import com.bingce.controlnetwork.func.level.sendreceive.LevelRequest; -import cn.liuyanbing.surveyor.function.level.sendreceive.LevelRequestRelease; +import com.bingce.controlnetwork.func.level.sendreceive.LevelRequestRelease; import com.bingce.controlnetwork.func.level.sendreceive.LevelRequestTest; /** diff --git a/app/src/main/java/com/bingce/controlnetwork/func/level/idetection/LevelIDetectionRecordActivity.kt b/app/src/main/java/com/bingce/controlnetwork/func/level/idetection/LevelIDetectionRecordActivity.kt index 0101c58..e5d1a6a 100644 --- a/app/src/main/java/com/bingce/controlnetwork/func/level/idetection/LevelIDetectionRecordActivity.kt +++ b/app/src/main/java/com/bingce/controlnetwork/func/level/idetection/LevelIDetectionRecordActivity.kt @@ -12,7 +12,7 @@ import blankj.utilcode.util.ToastUtils import com.bingce.controlnetwork.func.level.idetection.viewmodel.LevelIDetectionRecordVm import com.bingce.controlnetwork.func.level.sendreceive.ILevelBackData import com.bingce.controlnetwork.func.level.sendreceive.LevelRequest -import cn.liuyanbing.surveyor.function.level.sendreceive.LevelRequestRelease +import com.bingce.controlnetwork.func.level.sendreceive.LevelRequestRelease import com.bingce.controlnetwork.newui.widget.selectitem.SelectIDetectionStationFragment import com.bingce.controlapphelper.datasource.database.leveling.idetection.constants.LevelIDetectionConstant import com.bingce.controlapphelper.datasource.database.leveling.idetection.constants.LevelIDetectionConstant.I_A_B_I diff --git a/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/LevelRequest.kt b/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/LevelRequest.kt index 51978e5..a8bc98e 100644 --- a/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/LevelRequest.kt +++ b/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/LevelRequest.kt @@ -1,7 +1,6 @@ package com.bingce.controlnetwork.func.level.sendreceive import blankj.utilcode.util.ToastUtils -import cn.liuyanbing.surveyor.function.level.sendreceive.LevelRequestState import com.bingce.controlapphelper.leveling.detaction.LevelReceiveData import com.bingce.controlnetwork.App diff --git a/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/LevelRequestRelease.kt b/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/LevelRequestRelease.kt index c294fb7..5040e5b 100644 --- a/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/LevelRequestRelease.kt +++ b/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/LevelRequestRelease.kt @@ -1,9 +1,7 @@ -package cn.liuyanbing.surveyor.function.level.sendreceive +package com.bingce.controlnetwork.func.level.sendreceive import blankj.utilcode.util.ToastUtils import com.bingce.controlapphelper.leveling.detaction.LevelReceiveData -import com.bingce.controlnetwork.func.level.sendreceive.ILevelBackData -import com.bingce.controlnetwork.func.level.sendreceive.LevelRequest import com.bingce.device.Device import com.bingce.level.Level import com.bingce.level.LevelListener diff --git a/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/LevelRequestState.kt b/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/LevelRequestState.kt index 47f4504..a4eec44 100644 --- a/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/LevelRequestState.kt +++ b/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/LevelRequestState.kt @@ -1,4 +1,4 @@ -package cn.liuyanbing.surveyor.function.level.sendreceive +package com.bingce.controlnetwork.func.level.sendreceive import androidx.annotation.Keep diff --git a/app/src/main/java/com/bingce/controlnetwork/func/level/util/LevelExportUtilTj.kt b/app/src/main/java/com/bingce/controlnetwork/func/level/util/LevelExportUtilTj.kt index 63706ff..79f8909 100644 --- a/app/src/main/java/com/bingce/controlnetwork/func/level/util/LevelExportUtilTj.kt +++ b/app/src/main/java/com/bingce/controlnetwork/func/level/util/LevelExportUtilTj.kt @@ -4,7 +4,7 @@ import android.text.TextUtils import androidx.annotation.WorkerThread import blankj.utilcode.util.Utils -import cn.liuyanbing.surveyor.function.level.export.LevelExportIDetection +import com.bingce.controlnetwork.func.level.export.LevelExportIDetection import com.bingce.controlnetwork.func.level.export.LevelExportSingalHeight import com.bingce.controlapphelper.datasource.database.SurveyorDatabaseFactory import com.bingce.controlapphelper.datasource.database.leveling.LevelingDbFactory diff --git a/app/src/main/java/com/bingce/controlnetwork/newui/projectedit/ProjectCreateEditLevelFragment.kt b/app/src/main/java/com/bingce/controlnetwork/newui/projectedit/ProjectCreateEditLevelFragment.kt index fad467d..2912f01 100644 --- a/app/src/main/java/com/bingce/controlnetwork/newui/projectedit/ProjectCreateEditLevelFragment.kt +++ b/app/src/main/java/com/bingce/controlnetwork/newui/projectedit/ProjectCreateEditLevelFragment.kt @@ -8,7 +8,7 @@ import androidx.annotation.WorkerThread import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope import blankj.utilcode.util.ToastUtils -import cn.liuyanbing.surveyor.function.level.constant.LevelConstant +import com.bingce.controlnetwork.func.level.constant.LevelConstant import com.bingce.controlapphelper.datasource.database.ProjectTypeValue import com.bingce.controlapphelper.datasource.database.SurveyorDatabaseFactory