From 017022c1955316080f43f27d524d11662abb9867 Mon Sep 17 00:00:00 2001
From: jia <jmessage@163.com>
Date: Fri, 13 Sep 2024 21:23:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E5=90=8E=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E9=87=8D=E5=90=AF=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties                             |  4 ++--
 .../newbind/NewBindDeviceActivity.java        | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 2509cc0b7..e0bdf7d5a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,5 +26,5 @@ android.enableJetifier=true
 android.useAndroidX=true
 android.useDeprecatedNdk=true
 
-versionCode=48
-versionName=4.11.8
\ No newline at end of file
+versionCode=49
+versionName=4.11.9
\ No newline at end of file
diff --git a/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java b/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java
index 7decb53a3..abeeeff41 100644
--- a/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java
@@ -66,6 +66,7 @@ import com.ifish.tcp.BackFunctionCode7_11;
 import com.ifish.tcp.ModelCodec;
 import com.ifish.tcp.OrderDeviceConnectModel;
 import com.ifish.tcp.OrderModel;
+import com.ifish.tcp.QueryTempeSettingModel;
 import com.ifish.tcp.ResetDeviceModel;
 import com.ifish.utils.AnimationUtil;
 import com.ifish.utils.BlueToothUtil;
@@ -714,7 +715,25 @@ public class NewBindDeviceActivity extends AppCompatActivity {
             }
         });
     }
+    private  void toReset(){
+        ResetDeviceModel model = OrderModel.resetDevice();//设置正式环境域名
+        byte[] data = ModelCodec.enCode(model);
+//        data = new byte[1];
 
+//        QueryTempeSettingModel  xx = OrderModel.OrderQueryTempeSettingModel(device_mac);
+//        byte[] data = ModelCodec.enCode(xx);
+        BleManager.getInstance().write(currentDevice, SERVICE_UUID, WRITE_UUID, data,false, new BleWriteCallback() {
+            @Override
+            public void onWriteSuccess(int current, int total, byte[] justWrite) {
+                L.i("jjia-------------重启 发送 成功-");
+            }
+
+            @Override
+            public void onWriteFailure(BleException exception) {
+                L.i("jjia-------------重启 发送 失败"+exception.toString());
+            }
+        });
+    }
     private  void resetDevice(int type){
 
         dismissProgressDialogCancelble();
@@ -893,9 +912,11 @@ public class NewBindDeviceActivity extends AppCompatActivity {
                         public int compareTo(Boolean available) {
                             if (available) {
                                 // TODO 设备访问Internet正常
+                                toReset();
                                 isContinue = false;
                                 connectDevice.cancel();
                                 doPostBindDevice();
+
                             }
                             return 0;
                         }