control_common从main合并过来后，处理冲突问题

5 months ago · cf4925b468
parent 066a848348
commit cf4925b468
26 changed files with 74 additions and 38 deletions
--- a/aar/coordlib/build.gradle
+++ b/aar/coordlib/build.gradle
@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('coordlib-release.aar'))
--- a/aar/coordlib/coordlib-release.aar
+++ b/aar/coordlib/coordlib-release.aar
--- a/aar/rtk/rtk-release.aar
+++ b/aar/rtk/rtk-release.aar
--- a/aar/sensor/build.gradle
+++ b/aar/sensor/build.gradle
@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('sensor-release.aar'))
--- a/aar/sensor/sensor-release.aar
+++ b/aar/sensor/sensor-release.aar
--- a/aar/totalstation/totalstation-release.aar
+++ b/aar/totalstation/totalstation-release.aar
--- a/app/src/main/java/com/bingce/controlnetwork/activity/MainActivityUtils.java
+++ b/app/src/main/java/com/bingce/controlnetwork/activity/MainActivityUtils.java
@ -337,8 +337,33 @@ public class MainActivityUtils extends AppCompatActivityProviderUtils {
            }
        }
        if (!Device.getInstance().isDeviceConnected()) {
-            if (!"".equals(Device.getInstance().deviceBlueName)) {
-                String instrumentInfo = ActivityUtils.getTopActivity().getString(R.string.instrument_name) + ":" + Device.getInstance().deviceBlueName + "\n" + ActivityUtils.getTopActivity().getString(R.string.instrument_type_name) + ":" + Device.getInstance().deviceBrand;
+            String blueName;
+            String macAddress;
+            String brand;
+            switch (Device.getInstance().deviceType) {
+                case DEVICE_TYPE_TS:
+                    blueName = Device.getInstance().tsBlueName;
+                    macAddress = Device.getInstance().tsMacAddress;
+                    brand = Device.getInstance().tsBrand;
+                    break;
+                case DEVICE_TYPE_RTK:
+                    blueName = Device.getInstance().rtkBlueName;
+                    macAddress = Device.getInstance().rtkMacAddress;
+                    brand = Device.getInstance().rtkBrand;
+                    break;
+                case DEVICE_TYPE_LEVEL:
+                    blueName = Device.getInstance().levelBlueName;
+                    macAddress = Device.getInstance().levelMacAddress;
+                    brand = Device.getInstance().levelBrand;
+                    break;
+                default:
+                    blueName = Device.getInstance().sensorBlueName;
+                    macAddress = Device.getInstance().sensorMacAddress;
+                    brand = Device.getInstance().levelBrand;
+                    break;
+            }
+            if (!"".equals(blueName)) {
+                String instrumentInfo = ActivityUtils.getTopActivity().getString(R.string.instrument_name) + ":" + blueName + "\n" + ActivityUtils.getTopActivity().getString(R.string.instrument_type_name) + ":" + brand;
                new MaterialDialog.Builder(ActivityUtils.getTopActivity())
                        .title(R.string.quick_connect)
                        .content(instrumentInfo)
--- a/app/src/main/java/com/bingce/controlnetwork/activity/user/OpeningRenewalVipActivity.java
+++ b/app/src/main/java/com/bingce/controlnetwork/activity/user/OpeningRenewalVipActivity.java
@ -339,12 +339,12 @@ public class OpeningRenewalVipActivity extends ColorfulActivity {
     * @param fee 金额，单位分
     */
    private void nativeOrder(int fee) {
-        WxPayV3.getInstance().generateNativeVipOrder(this,
+        WxPayV3.getInstance().generateBcNativeVipOrder(this,
                LCUser.getCurrentUser().getSessionToken(),
                "导线助手会员",
                fee,
                orderType,
-                new WxPayV3.nativeOrderGenerateListener() {
+                new WxPayV3.NativeOrderGenerateListener() {
                    @Override
                    public void onOrderGenerateSuccess(String code_url) {
                        showQrCode(code_url);
@ -377,12 +377,12 @@ public class OpeningRenewalVipActivity extends ColorfulActivity {
                })
                .show();

-        WxPayV3.getInstance().generateAppVipOrder(this,
+        WxPayV3.getInstance().generateBcAppVipOrder(this,
                LCUser.getCurrentUser().getSessionToken(),
                "导线助手会员",
                fee,
                orderType,
-                new WxPayV3.appOrderGenerateListener() {
+                new WxPayV3.AppOrderGenerateListener() {
                    @Override
                    public void onOrderGenerateSuccess() {
                        hasPayResult = false;
--- 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
@ -6,7 +6,7 @@ import com.bingce.controlapphelper.datasource.database.leveling.LevelingDbFactor
 import com.bingce.controlapphelper.datasource.database.leveling.idetection.constants.LevelIDetectionConstant
 import com.bingce.controlapphelper.datasource.database.leveling.idetection.list.LevelIDetectionList
 import com.bingce.controlapphelper.datasource.database.leveling.idetection.record.LevelIDetectionRecord
-import com.bingce.controlapphelper.leveling.detaction.LevelFormatUtil
+import com.bingce.controlapphelper.detaction.LevelFormatUtil
 import com.bingce.controlapphelper.model.getLength
 import com.bingce.controlnetwork.func.level.util.LevelDateUtil
 import com.bingce.controlnetwork.func.level.util.LevelDateUtil.getLevelHeadDateHourMin
--- a/app/src/main/java/com/bingce/controlnetwork/func/level/export/LevelExportSingalHeight.kt
+++ b/app/src/main/java/com/bingce/controlnetwork/func/level/export/LevelExportSingalHeight.kt
@ -6,7 +6,7 @@ import com.bingce.controlapphelper.datasource.database.SurveyorDatabaseFactory
 import com.bingce.controlapphelper.datasource.database.leveling.LevelingDbFactory
 import com.bingce.controlapphelper.datasource.database.leveling.stationsetting.LevelingStationSettingRecord
 import com.bingce.controlapphelper.datasource.database.point.PointRecord
-import com.bingce.controlapphelper.leveling.detaction.LevelFormatUtil
+import com.bingce.controlapphelper.detaction.LevelFormatUtil
 import com.bingce.controlapphelper.model.LevelingMeasureOrder
 import com.bingce.controlapphelper.model._N
 import com.bingce.controlapphelper.model._S
--- 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
@ -20,10 +20,10 @@ import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;

 import com.bingce.controlapphelper.datasource.database.leveling.station.LevelingStationRecord;
-import com.bingce.controlapphelper.leveling.detaction.ILevelRefreshBtn;
-import com.bingce.controlapphelper.leveling.detaction.INextStation;
-import com.bingce.controlapphelper.leveling.detaction.LevelCheckBtnUtil;
-import com.bingce.controlapphelper.leveling.detaction.LevelReceiveData;
+import com.bingce.controlapphelper.detaction.ILevelRefreshBtn;
+import com.bingce.controlapphelper.detaction.INextStation;
+import com.bingce.controlapphelper.detaction.LevelCheckBtnUtil;
+import com.bingce.controlapphelper.detaction.LevelReceiveData;
 import com.bingce.controlapphelper.model.BundleConstants;
 import com.bingce.controlapphelper.surveyor.test.Test;
 import com.bingce.controlapphelper.util.Tools;
--- a/app/src/main/java/com/bingce/controlnetwork/func/level/fragment/LevelSurveySubFragment.java
+++ b/app/src/main/java/com/bingce/controlnetwork/func/level/fragment/LevelSurveySubFragment.java
@ -22,10 +22,10 @@ import com.bingce.controlapphelper.datasource.database.leveling.measure.backfron
 import com.bingce.controlapphelper.datasource.database.leveling.measure.station.LevelingMeasureStationRecord;
 import com.bingce.controlapphelper.datasource.database.leveling.station.LevelingStationRecord;
 import com.bingce.controlapphelper.datasource.database.leveling.stationsetting.LevelingStationSettingRecord;
-import com.bingce.controlapphelper.leveling.detaction.IDetectionHint;
-import com.bingce.controlapphelper.leveling.detaction.LevelReceiveData;
-import com.bingce.controlapphelper.leveling.detaction.LevelSpeakMsg;
-import com.bingce.controlapphelper.leveling.detaction.surveyorcache.SurveyorCacheData;
+import com.bingce.controlapphelper.detaction.IDetectionHint;
+import com.bingce.controlapphelper.detaction.LevelReceiveData;
+import com.bingce.controlapphelper.detaction.LevelSpeakMsg;
+import com.bingce.controlapphelper.detaction.surveyorcache.SurveyorCacheData;
 import com.bingce.controlapphelper.model.LevelToleranceNotice;
 import com.bingce.controlapphelper.model.LevelingMeasureOrderUtil;
 import com.bingce.controlapphelper.model.PickPointResult;
--- 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
@ -13,7 +13,7 @@ import blankj.utilcode.util.ToastUtils
 import com.bingce.controlapphelper.datasource.database.leveling.idetection.constants.LevelIDetectionConstant
 import com.bingce.controlapphelper.datasource.database.leveling.idetection.constants.LevelIDetectionConstant.I_A_B_I
 import com.bingce.controlapphelper.datasource.database.leveling.idetection.list.LevelIDetectionList
-import com.bingce.controlapphelper.leveling.detaction.LevelReceiveData
+import com.bingce.controlapphelper.detaction.LevelReceiveData
 import com.bingce.controlapphelper.model.BundleConstants
 import com.bingce.controlapphelper.util.Tools
 import com.bingce.controlapphelper.widget.swiperecyclerview.widget.DefaultItemDecoration
--- a/app/src/main/java/com/bingce/controlnetwork/func/level/idetection/adapter/LevelIDetectionRecordAdapter.java
+++ b/app/src/main/java/com/bingce/controlnetwork/func/level/idetection/adapter/LevelIDetectionRecordAdapter.java
@ -16,7 +16,7 @@ import androidx.annotation.NonNull;
 import com.bingce.controlapphelper.datasource.database.leveling.idetection.constants.LevelIDetectionConstant;
 import com.bingce.controlapphelper.datasource.database.leveling.idetection.isetting.LevelIDetectionSetting;
 import com.bingce.controlapphelper.datasource.database.leveling.idetection.record.LevelIDetectionRecord;
-import com.bingce.controlapphelper.leveling.detaction.LevelFormatUtil;
+import com.bingce.controlapphelper.detaction.LevelFormatUtil;
 import com.bingce.controlapphelper.util.Tools;
 import com.bingce.controlnetwork.R;
 import com.bingce.controlnetwork.databinding.ItemLevelIDetectionRecordBinding;
--- a/app/src/main/java/com/bingce/controlnetwork/func/level/idetection/viewmodel/LevelIDetectionRecordVm.kt
+++ b/app/src/main/java/com/bingce/controlnetwork/func/level/idetection/viewmodel/LevelIDetectionRecordVm.kt
@ -16,7 +16,7 @@ import com.bingce.controlapphelper.datasource.database.leveling.idetection.const
 import com.bingce.controlapphelper.datasource.database.leveling.idetection.isetting.LevelIDetectionSetting
 import com.bingce.controlapphelper.datasource.database.leveling.idetection.list.LevelIDetectionList
 import com.bingce.controlapphelper.datasource.database.leveling.idetection.record.LevelIDetectionRecord
-import com.bingce.controlapphelper.leveling.detaction.LevelFormatUtil
+import com.bingce.controlapphelper.detaction.LevelFormatUtil
 import com.bingce.controlapphelper.util.Tools
 import com.bingce.controlnetwork.func.level.idetection.LevelIDetectionCalUtil
 import com.bingce.controlnetwork.func.level.idetection.LevelIDetectionSurveyorData
--- a/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/ILevelBackData.kt
+++ b/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/ILevelBackData.kt
@ -1,6 +1,6 @@
 package com.bingce.controlnetwork.func.level.sendreceive

-import com.bingce.controlapphelper.leveling.detaction.LevelReceiveData
+import com.bingce.controlapphelper.detaction.LevelReceiveData

 interface ILevelBackData {
    fun receive(data: LevelReceiveData)
--- 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,7 @@
 package com.bingce.controlnetwork.func.level.sendreceive

 import blankj.utilcode.util.ToastUtils
-import com.bingce.controlapphelper.leveling.detaction.LevelReceiveData
+import com.bingce.controlapphelper.detaction.LevelReceiveData
 import com.bingce.controlnetwork.App

 abstract class LevelRequest(protected val backDataI: ILevelBackData) {
--- 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,7 +1,7 @@
 package com.bingce.controlnetwork.func.level.sendreceive

 import blankj.utilcode.util.ToastUtils
-import com.bingce.controlapphelper.leveling.detaction.LevelReceiveData
+import com.bingce.controlapphelper.detaction.LevelReceiveData
 import com.bingce.device.Device
 import com.bingce.level.Level
 import com.bingce.level.LevelListener
--- a/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/LevelRequestTest.kt
+++ b/app/src/main/java/com/bingce/controlnetwork/func/level/sendreceive/LevelRequestTest.kt
@ -7,7 +7,7 @@ import android.os.Message
 import android.util.Log
 import blankj.utilcode.util.ToastUtils
 import blankj.utilcode.util.Utils
-import com.bingce.controlapphelper.leveling.detaction.LevelReceiveData
+import com.bingce.controlapphelper.detaction.LevelReceiveData
 import com.bingce.controlapphelper.util.GsonUtil
 import com.bingce.path.PathManager
 import com.bingce.utils.FileUtil
--- 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
@ -12,7 +12,7 @@ import com.bingce.controlapphelper.datasource.database.leveling.measure.backfron
 import com.bingce.controlapphelper.datasource.database.leveling.route.LevelRouteRecord
 import com.bingce.controlapphelper.datasource.database.leveling.station.LevelingStationRecord
 import com.bingce.controlapphelper.datasource.database.point.PointRecord
-import com.bingce.controlapphelper.leveling.detaction.LevelFormatUtil
+import com.bingce.controlapphelper.detaction.LevelFormatUtil
 import com.bingce.controlapphelper.model.LevelExportLine
 import com.bingce.controlapphelper.model.LevelingMeasureOrder
 import com.bingce.controlapphelper.model.LevelingMeasureOrderUtil
--- a/app/src/main/java/com/bingce/controlnetwork/func/level/viewmodel/LevelCreateOrEditRouteVm.kt
+++ b/app/src/main/java/com/bingce/controlnetwork/func/level/viewmodel/LevelCreateOrEditRouteVm.kt
@ -190,7 +190,9 @@ class LevelCreateOrEditRouteVm : ViewModel() {
    private fun checkCanEdit(projectId: String, routeIdParam: String?): Boolean {
        //路线有数据时候不能编辑
        val routeId = routeIdParam ?: return true
-        val routeRecord = SurveyorDatabaseFactory.instance.getRouteDataSource().getByIdSync(routeId)
+//        val routeRecord = SurveyorDatabaseFactory.instance.getRouteDataSource().getByIdSync(routeId)
+        // 应该查 ___LEVEL_ROUTE_RECORDS____ 表
+        val routeRecord = LevelingDbFactory.instance.levelDataSource.getByIdSync(routeId)
        if (routeRecord != null) {
            val stationList = LevelingDbFactory.instance.getStationDataSource()
                .getStationList(projectId, routeRecord.getId(), false)
--- a/app/src/main/java/com/bingce/controlnetwork/func/level/viewmodel/LevelSuveyorSubVm.kt
+++ b/app/src/main/java/com/bingce/controlnetwork/func/level/viewmodel/LevelSuveyorSubVm.kt
@ -14,12 +14,12 @@ import com.bingce.controlapphelper.datasource.database.leveling.measure.station.
 import com.bingce.controlapphelper.datasource.database.leveling.station.LevelingStationRecord
 import com.bingce.controlapphelper.datasource.database.leveling.tolerance.LevelingToleranceDetail
 import com.bingce.controlapphelper.datasource.database.point.PointRecord
-import com.bingce.controlapphelper.leveling.detaction.DetectionController
-import com.bingce.controlapphelper.leveling.detaction.IDetectionHint
-import com.bingce.controlapphelper.leveling.detaction.INextStation
-import com.bingce.controlapphelper.leveling.detaction.LevelReceiveData
-import com.bingce.controlapphelper.leveling.detaction.LevelingProcess
-import com.bingce.controlapphelper.leveling.detaction.surveyorcache.SurveyorCacheData
+import com.bingce.controlapphelper.detaction.DetectionController
+import com.bingce.controlapphelper.detaction.IDetectionHint
+import com.bingce.controlapphelper.detaction.INextStation
+import com.bingce.controlapphelper.detaction.LevelReceiveData
+import com.bingce.controlapphelper.detaction.LevelingProcess
+import com.bingce.controlapphelper.detaction.surveyorcache.SurveyorCacheData
 import com.bingce.controlapphelper.model.B1
 import com.bingce.controlapphelper.model.B2
 import com.bingce.controlapphelper.model.F1
--- a/app/src/main/java/com/bingce/controlnetwork/func/level/viewmodel/LevelSuveyorVm.kt
+++ b/app/src/main/java/com/bingce/controlnetwork/func/level/viewmodel/LevelSuveyorVm.kt
@ -9,9 +9,9 @@ import com.bingce.controlapphelper.datasource.database.SurveyorDatabaseFactory
 import com.bingce.controlapphelper.datasource.database.leveling.LevelingDbFactory
 import com.bingce.controlapphelper.datasource.database.leveling.station.LevelingStationRecord
 import com.bingce.controlapphelper.datasource.database.leveling.stationsetting.LevelingStationSettingRecord
-import com.bingce.controlapphelper.leveling.detaction.ILevelRefreshBtn
-import com.bingce.controlapphelper.leveling.detaction.INextStation
-import com.bingce.controlapphelper.leveling.detaction.LevelCheckBtnUtil
+import com.bingce.controlapphelper.detaction.ILevelRefreshBtn
+import com.bingce.controlapphelper.detaction.INextStation
+import com.bingce.controlapphelper.detaction.LevelCheckBtnUtil
 import com.bingce.controlapphelper.model.LevelingMeasureOrder
 import com.bingce.controlapphelper.model.LevelingStationState
 import com.bingce.controlnetwork.func.level.util.LevelDateUtil
--- a/buildSrc/src/main/java/com/bingce/kotlin/com/bingce/ModuleName.kt
+++ b/buildSrc/src/main/java/com/bingce/kotlin/com/bingce/ModuleName.kt
@ -29,7 +29,7 @@ class ModuleName(project: Project) {
        }

        if (listOf(
-                "level", "rtk", "totalstation"
+                "level", "rtk", "totalstation", "coordlib", "sensor"
            ).contains(name)
        ) {
            return if ("false" == useDeviceAAR) {
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 285a581a09dbb77e874f53e7509bab74cc43fa35
+Subproject commit 78de7b2c0c40108b2bca26c2ac399c905d5e1def
--- a/settings.gradle
+++ b/settings.gradle
@ -62,7 +62,7 @@ static def bingceModule(ProjectDescriptor rootProject, String name) {
        }
    }
    if (Arrays.asList(
-            "level", "rtk", "totalstation"
+            "level", "rtk", "totalstation", "coordlib", "sensor"
    ).contains(name)) {
        if ("false" == useDeviceAAR) {
            return ":bingce:$name"
@ -117,7 +117,8 @@ includeBingceModule(settings, rootProject, bcDir, "base-java")
 includeBingceModule(settings, rootProject, bcDir, "appBase")
 includeBingceModule(settings, rootProject, bcDir, "leancloud")
 includeBingceModule(settings, rootProject, bcDir, "repository")
-includeBingceModule(settings, rootProject, bcDir, "coordlib")
+//includeBingceModule(settings, rootProject, bcDir, "coordlib")
+//includeBingceModule(settings, rootProject, bcDir, "sensor")
 includeBingceModule(settings, rootProject, bcDir, "device")
 includeBingceModule(settings, rootProject, bcDir, "device-ui")
 includeBingceModule(settings, rootProject, bcDir, "utils")
@ -164,3 +165,7 @@ includeSdkModule(settings, rootProject, bcDir, "ruide-extension-sdk")
 includeSdkModule(settings, rootProject, bcDir, "huaceRtkSdk")
 includeSdkModule(settings, rootProject, bcDir, "southGnssSdk")
 includeSdkModule(settings, rootProject, bcDir, "tensorFlowTTS")
+
+
+include bingceModule(rootProject, "coordlib")
+include bingceModule(rootProject, "sensor")