军测第一个版本

app/src/main/java/com/bingce/controlnetwork/activity/user/RegisterActivity.java

@@ -1,15 +1,11 @@
 package com.bingce.controlnetwork.activity.user;
 
-import android.Manifest;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.Color;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
@@ -19,9 +15,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.ContextCompat;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -40,7 +34,6 @@ import com.bingce.utils.RegisterUtil;
 import com.bingce.utils.SdkUtils;
 import com.bingce.utils.StringUtil;
 import com.bingce.utils.Util;
-import com.bingce.utils.VipManager;
 import com.hjq.permissions.OnPermissionCallback;
 import com.hjq.permissions.Permission;
 import com.hjq.permissions.XXPermissions;
@@ -58,12 +51,6 @@ import java.util.Locale;
 import blankj.utilcode.util.AppUtils;
 import blankj.utilcode.util.ToastUtils;
 import blankj.utilcode.util.Utils;
-import cn.leancloud.LCException;
-import cn.leancloud.LCObject;
-import cn.leancloud.LCQuery;
-import cn.leancloud.LCUser;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
 
 public class RegisterActivity extends ColorfulActivity {
     private MaterialEditText met_machine_code, met_activate_code;
@@ -233,10 +220,33 @@ public class RegisterActivity extends ColorfulActivity {
                     ToastUtils.showShort(R.string.register_code_is_16_characters);
                     return;
                 }
-                if (CheckRegUtil.checkReg(registerCode)){
+
+                progressDialog = new ProgressDialog(RegisterActivity.this);
+                progressDialog.setMessage(getString(R.string.please_wait));
+                progressDialog.setCanceledOnTouchOutside(false);
+                progressDialog.show();
+
+                if (CheckRegUtil.checkReg(registerCode)) {
                     ((App) Utils.getApp()).registerCodeV2 = registerCode;
                     Util.putPreference("registerCodeV2", registerCode);
+
+                    getSupportActionBar().setTitle(R.string.activated);
+                    mBtnActivate.setEnabled(false);
+                    met_activate_code.setEnabled(false);
+
+                    getSupportActionBar().setTitle(R.string.activated);
+                    mBtnActivate.setEnabled(false);
+                    met_activate_code.setEnabled(false);
+                    mBtnActivate.setText(R.string.activated);
+
+                    ToastUtils.showShort(R.string.activate_success);
+
+                    progressDialog.dismiss();
+                } else {
+                    ToastUtils.showShort("激活失败，请联系管理员");
+                    progressDialog.dismiss();
                 }
+
             }
         });
         mBtnTaobaoLink.setOnClickListener(new OnClickListener() {

app/src/main/java/com/bingce/controlnetwork/fragment/SelectToleranceTemplateBottomSheetFragment.java

@@ -16,13 +16,13 @@ import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.LifecycleOwner;
 
+import com.bingce.controlnetwork.R;
+
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.jetbrains.annotations.NotNull;
 
-import com.bingce.controlnetwork.R;
-
 /**
  * 选择限差参考模板（自定义限差管理点击+后的操作）
  */
@@ -32,9 +32,6 @@ public class SelectToleranceTemplateBottomSheetFragment extends DialogFragment {
 
     private String projectType;
 
-    private SelectToleranceTemplateBottomSheetFragment() {
-    }
-
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);

app/src/main/java/com/bingce/controlnetwork/fragment/ToleranceManageFragment.java

@@ -58,7 +58,6 @@ public class ToleranceManageFragment extends BaseFragment {
     }
 
     @Nullable
-    @org.jetbrains.annotations.Nullable
     @Override
     public View onCreateView(@NonNull @NotNull LayoutInflater inflater, @Nullable @org.jetbrains.annotations.Nullable ViewGroup container, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
         View rootView = inflater.inflate(R.layout.fragment_tolerance_manager_layout, container, false);
@@ -113,7 +112,9 @@ public class ToleranceManageFragment extends BaseFragment {
         });
     }
 
-
+    /**
+     * 新建选择限差参考模版
+     */
     private void showSelectedToleranceDlg(View view) {
         SelectToleranceTemplateBottomSheetFragment.select(
                 getChildFragmentManager(),

app/src/main/java/com/bingce/controlnetwork/func/level/fragment/LevelRouteCreateEditFragment.kt

@@ -34,6 +34,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
+/**
+ * 新建编辑测段
+ */
 class LevelRouteCreateEditFragment : BaseFragmentBinding<FragmentLevelCreateRouteBinding>() {
 
     private val viewModel by viewModels<LevelCreateOrEditRouteVm>()
@@ -90,7 +93,6 @@ class LevelRouteCreateEditFragment : BaseFragmentBinding<FragmentLevelCreateRout
         }
     }
 
-
     override fun getViewBinding(
         inflater: LayoutInflater,
         container: ViewGroup?
@@ -143,7 +145,10 @@ class LevelRouteCreateEditFragment : BaseFragmentBinding<FragmentLevelCreateRout
                         it.observationDirection
                     )
                 )
+                val spinnerShowPosByLevelingMeasureOrder =
+                    LevelingMeasureOrderUtil.getSpinnerShowPosByLevelingMeasureOrderPla(it.levelingMeasureOrder)
 
+                mBinding.spinner.setSelection(spinnerShowPosByLevelingMeasureOrder)
 //                //经纬度
 //                if (isEmpty(it.longitude) || isEmpty(it.latitude)) {
 //                    setDefaultLocation()
@@ -206,7 +211,7 @@ class LevelRouteCreateEditFragment : BaseFragmentBinding<FragmentLevelCreateRout
      * 照准次序
      */
     private fun initLevelOrder() {
-        val showList = LevelingMeasureOrderUtil.getShowList()
+        val showList = LevelingMeasureOrderUtil.getShowListPla()
         mBinding.spinner.setAdapter(
             ArrayAdapter(
                 requireContext(),
@@ -228,10 +233,6 @@ class LevelRouteCreateEditFragment : BaseFragmentBinding<FragmentLevelCreateRout
 
             override fun onNothingSelected(parent: AdapterView<*>?) {}
         }
-
-
-
-        mBinding.spinner.setSelection(0)
     }
 
     /**
@@ -278,21 +279,21 @@ class LevelRouteCreateEditFragment : BaseFragmentBinding<FragmentLevelCreateRout
             return
         }
 
-        val longitude = mBinding.etLongitude.getText().toString().trim()
+//        val longitude = mBinding.etLongitude.getText().toString().trim()
-        if (TextUtils.isEmpty(longitude)) {
+//        if (TextUtils.isEmpty(longitude)) {
-            ToastUtils.showShort(R.string.please_input_longitude)
+//            ToastUtils.showShort(R.string.please_input_longitude)
-            return
+//            return
-        }
+//        }
-        val latitude = mBinding.etLatitude.getText().toString().trim()
+//        val latitude = mBinding.etLatitude.getText().toString().trim()
-        if (TextUtils.isEmpty(latitude)) {
+//        if (TextUtils.isEmpty(latitude)) {
-            ToastUtils.showShort(R.string.please_input_latitude)
+//            ToastUtils.showShort(R.string.please_input_latitude)
-            return
+//            return
-        }
+//        }
-        val height = mBinding.etHeight.getText().toString().trim()
+//        val height = mBinding.etHeight.getText().toString().trim()
-        if (TextUtils.isEmpty(height)) {
+//        if (TextUtils.isEmpty(height)) {
-            ToastUtils.showShort(R.string.please_enter_elevation)
+//            ToastUtils.showShort(R.string.please_enter_elevation)
-            return
+//            return
-        }
+//        }
 
         val levelRouteSave = LevelRouteSave()
         levelRouteSave.projectId = projectId

app/src/main/java/com/bingce/controlnetwork/func/level/viewmodel/LevelCreateOrEditRouteVm.kt

@@ -261,6 +261,7 @@ class LevelCreateOrEditRouteVm : ViewModel() {
                     SurveyorDatabaseFactory.instance.pointDataSource.findByIdSync(it.endPointId)
                 result.startPointName = startPoint?.name
                 result.endPointName = endPoint?.name
+                result.levelingMeasureOrder=it.levelingMeasureOrder
                 withContext(Dispatchers.Main) {
                     callBack(result)
                 }

control_common

@@ -1 +1 @@
-Subproject commit 17c41fefdecef36e54da06af009dad14c35fba2a
+Subproject commit 0c4327501a3bc4830c366d2b7f9c947839152a29