From edfa6331f5e385dfe27129da5961cd7ed7a70f29 Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Thu, 4 Jun 2026 16:49:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E8=93=9D=E7=89=99=EF=BC=8C?=
 =?UTF-8?q?=E9=85=8D=E7=BD=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  2 ++
 .../water/device/AddDeviceActivity_copy.java  | 23 ++++++++-----------
 .../ckkj/water/device/SelectWifiActivity.java |  2 ++
 .../water/espBle/EspProvisionManager.java     | 10 +++++++-
 .../ckkj/water/espBle/ProvisionConfig.java    | 10 ++++++++
 app/src/main/res/layout/add_device_layout.xml |  3 ++-
 app/src/main/res/layout/device_reset_wifi.xml | 11 +++++++++
 7 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a47c978..4d22b8d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -233,5 +233,7 @@ dependencies {
     implementation 'no.nordicsemi.android:ble:2.11.0'
     //espressif官方sdk，用于esp固件的扫描，配网等。
     implementation 'com.github.espressif:esp-idf-provisioning-android:lib-2.2.3'
+    //自定义progressBar
+    implementation 'com.timqi.sectorprogressview:library:2.0.1'
 }
 
diff --git a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java
index 1e27108..e73ec72 100644
--- a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java
+++ b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java
@@ -121,20 +121,6 @@ public class AddDeviceActivity_copy extends BaseActivity<AddDeviceLayoutBinding,
             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();
     }
 
@@ -201,6 +187,15 @@ public class AddDeviceActivity_copy extends BaseActivity<AddDeviceLayoutBinding,
                 bleAdapter.notifyItemInserted(mDeviceList.size() - 1);
                 if(bleAdapter.getItemCount() != 0){
                     viewBinding.rvDevices.setVisibility(VISIBLE);
+                    // 停止帧动画
+                    ImageView ivScanAnimation = viewBinding.ivScanAnimation;
+                    if (ivScanAnimation.getDrawable() instanceof AnimationDrawable) {
+                        AnimationDrawable animationDrawable = (AnimationDrawable) ivScanAnimation.getDrawable();
+                        if (animationDrawable.isRunning()) {
+                            animationDrawable.stop();
+                            viewBinding.ivScanAnimation.setVisibility(GONE);
+                        }
+                    }
                 }
 
             }
diff --git a/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java b/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
index 3091d51..b37f2f0 100644
--- a/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
@@ -217,11 +217,13 @@ public class SelectWifiActivity extends BaseActivity<DeviceResetWifiBinding, Dev
             @Override
             public void onProvisioning(int progress) {
                 Log.i("TEST","WIFI连接进度 == " +  progress);
+                viewBinding.tvProgress.setText("进度:" + progress + "%");
             }
 
             @Override
             public void onSuccess(String deviceName, String deviceType) {
                 Log.i("TEST","deviceName：" + deviceName + "连接成功");
+                ToastUtil.showShort(mContext, deviceName + "连接成功");
             }
 
             @Override
diff --git a/app/src/main/java/com/ckkj/water/espBle/EspProvisionManager.java b/app/src/main/java/com/ckkj/water/espBle/EspProvisionManager.java
index 486d11f..f646729 100644
--- a/app/src/main/java/com/ckkj/water/espBle/EspProvisionManager.java
+++ b/app/src/main/java/com/ckkj/water/espBle/EspProvisionManager.java
@@ -44,6 +44,7 @@ public class EspProvisionManager {
     private boolean provisioning;
     private boolean eventBusRegistered;
     private boolean ignoreNextDisconnectEvent;
+    private boolean expectDisconnected; // 标记是否预期断开（配网成功后）
     private String currentDeviceName;
     private String currentDeviceType = ProvisionConfig.TRANSPORT_BLE;
 
@@ -328,7 +329,12 @@ public class EspProvisionManager {
                 boolean shouldNotify = connected || connecting || provisioning;
                 resetState();
                 if (shouldNotify) {
-                    notifyDisconnected();
+                    // 如果是配网成功后的预期断开，不发送断开回调
+                    // 因为 onSuccess 已经通知过了
+                    if (!expectDisconnected) {
+                        notifyDisconnected();
+                    }
+                    expectDisconnected = false; // 重置标志
                 }
                 break;
 
@@ -364,6 +370,7 @@ public class EspProvisionManager {
         connected = false;
         provisioning = false;
         ignoreNextDisconnectEvent = false;
+        // expectDisconnected 保持不变，用于断开回调判断
     }
 
     private ESPConstants.SecurityType parseSecurityType(int securityType) {
@@ -379,6 +386,7 @@ public class EspProvisionManager {
     private void finishProvisionSuccess() {
         mainHandler.removeCallbacks(provisionTimeoutTask);
         provisioning = false;
+        expectDisconnected = true; // 标记为预期断开
         notifyProvisioning(100);
         notifySuccess();
     }
diff --git a/app/src/main/java/com/ckkj/water/espBle/ProvisionConfig.java b/app/src/main/java/com/ckkj/water/espBle/ProvisionConfig.java
index 3d9cda0..6a9a237 100644
--- a/app/src/main/java/com/ckkj/water/espBle/ProvisionConfig.java
+++ b/app/src/main/java/com/ckkj/water/espBle/ProvisionConfig.java
@@ -54,6 +54,16 @@ public class ProvisionConfig {
      */
     public static final int DEFAULT_SECURITY = SECURITY_1;
 
+    /**
+     * 默认 PoP，需和 ESP 固件保持一致
+     */
+    public static final String DEFAULT_PROOF_OF_POSSESSION = "abcd1234";
+
+    /**
+     * Security2 使用的默认用户名
+     */
+    public static final String DEFAULT_USER_NAME = "";
+
     /**
      * 连接超时时间 (毫秒)
      */
diff --git a/app/src/main/res/layout/add_device_layout.xml b/app/src/main/res/layout/add_device_layout.xml
index 77ef5fd..881c22d 100644
--- a/app/src/main/res/layout/add_device_layout.xml
+++ b/app/src/main/res/layout/add_device_layout.xml
@@ -95,5 +95,6 @@
         android:paddingVertical="@dimen/dp_10"
         android:layout_marginHorizontal="@dimen/dp_20"
         android:layout_marginTop="@dimen/dp_40"
-        android:gravity="center"/>
+        android:gravity="center"
+        android:visibility="gone"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/device_reset_wifi.xml b/app/src/main/res/layout/device_reset_wifi.xml
index 98606ca..4587674 100644
--- a/app/src/main/res/layout/device_reset_wifi.xml
+++ b/app/src/main/res/layout/device_reset_wifi.xml
@@ -95,6 +95,16 @@
                 android:hint="@string/input_wifi_psd_tip"/>
         </LinearLayout>
     </LinearLayout>
+    <TextView
+        android:id="@+id/tv_progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_10"
+        android:textSize="20sp"
+        android:textColor="@color/textPrimaryColor"
+        android:text="进度"
+        android:textStyle="bold"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_wifi_list"
@@ -117,4 +127,5 @@
         android:layout_marginTop="@dimen/dp_40"
         android:gravity="center"
         android:visibility="gone"/>
+
 </LinearLayout>
\ No newline at end of file