From 8a0ed3fb42f68149e45c7903d1d9ef427f652c13 Mon Sep 17 00:00:00 2001 From: huangwei <983142558@qq.com> Date: Thu, 29 Aug 2024 11:16:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=9B=E6=B5=8B=E7=AC=AC=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/user/RegisterActivity.java | 38 ++++++++++------ ...tToleranceTemplateBottomSheetFragment.java | 7 +-- .../fragment/ToleranceManageFragment.java | 5 ++- .../fragment/LevelRouteCreateEditFragment.kt | 43 ++++++++++--------- .../viewmodel/LevelCreateOrEditRouteVm.kt | 1 + control_common | 2 +- 6 files changed, 53 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/com/bingce/controlnetwork/activity/user/RegisterActivity.java b/app/src/main/java/com/bingce/controlnetwork/activity/user/RegisterActivity.java index 0fba0a6..90fdba1 100644 --- a/app/src/main/java/com/bingce/controlnetwork/activity/user/RegisterActivity.java +++ b/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() { diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/SelectToleranceTemplateBottomSheetFragment.java b/app/src/main/java/com/bingce/controlnetwork/fragment/SelectToleranceTemplateBottomSheetFragment.java index ad345da..705f43a 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/SelectToleranceTemplateBottomSheetFragment.java +++ b/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); diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/ToleranceManageFragment.java b/app/src/main/java/com/bingce/controlnetwork/fragment/ToleranceManageFragment.java index 336c84f..70bd61d 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/ToleranceManageFragment.java +++ b/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(), 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 0c69b8c..97cbd48 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 @@ -34,6 +34,9 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +/** + * 新建编辑测段 + */ class LevelRouteCreateEditFragment : BaseFragmentBinding() { private val viewModel by viewModels() @@ -90,7 +93,6 @@ class LevelRouteCreateEditFragment : BaseFragmentBinding?) {} } - - - - mBinding.spinner.setSelection(0) } /** @@ -278,21 +279,21 @@ class LevelRouteCreateEditFragment : BaseFragmentBinding