From 01e4f0aefae5bf622cfe2101913fa4c3087d7251 Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Fri, 3 Jul 2026 15:48:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=91=E8=BF=9B?=
=?UTF-8?q?=E5=BA=A6=E5=AE=9E=E6=97=B6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/AndroidManifest.xml | 4 -
.../water/device/AddDeviceActivity_cpoy2.java | 218 ------------------
.../water/device/DeviceConnectActivity.java | 26 ++-
.../water/espBle/EspProvisionManager.java | 55 ++++-
4 files changed, 77 insertions(+), 226 deletions(-)
delete mode 100644 app/src/main/java/com/ckkj/water/device/AddDeviceActivity_cpoy2.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 64a63e2..ecc2dfb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -167,10 +167,6 @@
android:name="com.ckkj.water.permission.PermissionActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize"/>
-
- implements DeviceContract.DeviceView, EasyPermissions.PermissionCallbacks {
- @Override
- public DevicePresenter createPresenter() {
- return new DevicePresenter(new DeviceImpl());
- }
-
-
- @Override
- public void initData(Bundle savedInstanceState) {
- super.initData(savedInstanceState);
- ActivityManager.addActivity(this,getClass().getSimpleName() + "_" + ConstantUtil.ADD_DEVICE_FLAG);
- ImmersionBar.with(this)
- .statusBarColor(R.color.mainBackgroundColor) // 设置状态栏颜色
- .statusBarDarkFont(ThemeManager.isAppThemeLight(mContext)) // 设置状态栏字体为黑色
- .titleBar(viewBinding.rlTitle)
- .init();
- viewBinding.includedTitle.tvTitle.setText(R.string.add_device_title);
- // 启动帧动画
- ImageView ivScanAnimation = viewBinding.ivScanAnimation;
- if (ivScanAnimation.getDrawable() instanceof AnimationDrawable) {
- AnimationDrawable animationDrawable = (AnimationDrawable) ivScanAnimation.getDrawable();
- animationDrawable.start();
- }
- new Handler().postDelayed(new Runnable() {
- @Override
- public void run() {
- // 停止帧动画
- ImageView ivScanAnimation = viewBinding.ivScanAnimation;
- if (ivScanAnimation.getDrawable() instanceof AnimationDrawable) {
- AnimationDrawable animationDrawable = (AnimationDrawable) ivScanAnimation.getDrawable();
- if (animationDrawable.isRunning()) {
- animationDrawable.stop();
- viewBinding.ivScanAnimation.setVisibility(GONE);
- }
- }
- }
- },3000);
- initListener();
- }
-
-
- private void initListener() {
- setClick(viewBinding.includedTitle.imgBack);
- setClick(viewBinding.tvScanAdd);
- }
-
- private void setClick(View view) {
- view.setOnClickListener(this::onClick);
- }
-
- public void onClick(View v){
- switch (v.getId()){
- case R.id.img_back:
- finish();
- break;
-
- case R.id.img_device_item:
- Bundle bundle = new Bundle();
- bundle.putInt(ConstantUtil.ACTIVITY_NAVIGATE_FLAG,100);
- goTo(mContext, SelectWifiActivity.class,bundle);
- break;
-
- case R.id.tv_scan_add:
- //检测有无相机权限
- String readPermission = Manifest.permission.CAMERA;
- if(!hasRecordPermission(readPermission)){
- getPermissionRequst(readPermission,"权限申请",
- "智能浇水需要您的授权访问相机，并使用扫一扫",REQUEST_EVENT_CODE_10001);
- }else{
- scanQrcode();
- }
- break;
- }
- }
-
- private void scanQrcode() {
- //默认扫描
- MNScanManager.startScan(mContext, new MNScanCallback() {
- @Override
- public void onActivityResult(int resultCode, Intent data) {
- switch (resultCode) {
- case MNScanManager.RESULT_SUCCESS:
- ArrayList results = data.getStringArrayListExtra(MNScanManager.INTENT_KEY_RESULT_SUCCESS);
- if(results != null){
- ToastUtil.showShort(mContext,results.get(0).toString());
- }
- break;
- case MNScanManager.RESULT_FAIL:
- String resultError = data.getStringExtra(MNScanManager.INTENT_KEY_RESULT_ERROR);
- break;
- case MNScanManager.RESULT_CANCLE:
- ToastUtil.showShort(mContext,"取消扫码");
- break;
- }
- }
- });
- }
-
-
- @Override
- protected void onPause() {
- super.onPause();
- // 停止帧动画
- ImageView ivScanAnimation = viewBinding.ivScanAnimation;
- if (ivScanAnimation.getDrawable() instanceof AnimationDrawable) {
- AnimationDrawable animationDrawable = (AnimationDrawable) ivScanAnimation.getDrawable();
- if (animationDrawable.isRunning()) {
- animationDrawable.stop();
- }
- }
- }
-
- @Override
- public int getLayoutResId(Bundle savedInstanceState) {
- return 0;
- }
-
- @Override
- public void showError(String message) {
-
- }
-
- @Override
- public void logOut(BaseBean bean) {
-
-
- }
-
- @Override
- public void onRequestPermissionsResult(int requestCode, @NonNull @NotNull String[] permissions, @NonNull @NotNull int[] grantResults) {
- super.onRequestPermissionsResult(requestCode, permissions, grantResults);
- EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
- }
-
- @Override
- public void onPermissionsGranted(int requestCode, @NonNull List perms) {
- hidePermissionDialog();
- if (requestCode == REQUEST_EVENT_CODE_10001) {
- scanQrcode();
- }
- }
-
- @Override
- public void onPermissionsDenied(int requestCode, @NonNull List perms) {
-
- }
-
- @Override
- public void addDeviceSuccess(WaterDeviceEntity bean) {
-
- }
-
- @Override
- public void getDeviceDetailInfo(WaterDeviceEntity bean) {
-
- }
-
- @Override
- public void editDeviceInfoSuccess(BaseBean bean) {
-
- }
-
- @Override
- public void deleteDeviceSuccess(BaseBean bean) {
-
- }
-
- @Override
- public void turnOnOffDeviceSuccess(BaseBean bean, String status) {
-
- }
-
- @Override
- public void queryDeviceBindStatusSuccess(WaterDeviceEntity bean) {
-
- }
-}
diff --git a/app/src/main/java/com/ckkj/water/device/DeviceConnectActivity.java b/app/src/main/java/com/ckkj/water/device/DeviceConnectActivity.java
index 495214b..35ce903 100644
--- a/app/src/main/java/com/ckkj/water/device/DeviceConnectActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/DeviceConnectActivity.java
@@ -3,6 +3,7 @@ package com.ckkj.water.device;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
+import android.content.Intent;
import android.graphics.drawable.AnimationDrawable;
import android.os.Bundle;
import android.os.Handler;
@@ -150,7 +151,8 @@ public class DeviceConnectActivity extends BaseActivity