From 1392ec42204baa7e289664371b009678bee040a6 Mon Sep 17 00:00:00 2001
From: Jay Gao <1109258889@qq.com>
Date: Tue, 9 Aug 2022 15:24:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=8A=E4=BC=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../z1/version5/ChooseVersionActivity.java      |  3 +++
 .../z1/ybl/light/YblLightSearchActivity.java    | 17 +++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/yonsz/z1/version5/ChooseVersionActivity.java b/app/src/main/java/com/yonsz/z1/version5/ChooseVersionActivity.java
index 80a8d3a..93020fa 100644
--- a/app/src/main/java/com/yonsz/z1/version5/ChooseVersionActivity.java
+++ b/app/src/main/java/com/yonsz/z1/version5/ChooseVersionActivity.java
@@ -192,6 +192,9 @@ public class ChooseVersionActivity extends BaseActivity {
         map.put("standardCodes", deviceModelsBean.getStandardCodes());
         map.put("deviceType", deviceType);
         map.put("deviceModel", deviceModel);
+        if (null != getIntent().getExtras().get("version")) {
+            map.put("version", getIntent().getExtras().get("version").toString());
+        }
         util.requestGetByAsy(NetWorkUrl.DEIVCE_AIDEVICE_LIST, map, new NetWorkUtil.ReqCallBack() {
             @Override
             public void onSuccess(String respone) {
diff --git a/app/src/main/java/com/yonsz/z1/ybl/light/YblLightSearchActivity.java b/app/src/main/java/com/yonsz/z1/ybl/light/YblLightSearchActivity.java
index 3791a83..04729ba 100644
--- a/app/src/main/java/com/yonsz/z1/ybl/light/YblLightSearchActivity.java
+++ b/app/src/main/java/com/yonsz/z1/ybl/light/YblLightSearchActivity.java
@@ -276,16 +276,13 @@ public class YblLightSearchActivity extends BaseActivity {
     }
 
     private void showIsFinishThis() {
-        ConfirmDialog dialog = new ConfirmDialog(getActivity(), new Callback() {
-            @Override
-            public void callback(int position) {
-                switch (position) {
-                    case 0:
-                        break;
-                    case 1:
-                        finish();
-                        break;
-                }
+        ConfirmDialog dialog = new ConfirmDialog(getActivity(), position -> {
+            switch (position) {
+                case 0:
+                    break;
+                case 1:
+                    finish();
+                    break;
             }
         });
         dialog.setContent("您正在搜索设备中请勿退出，如有退出可能在接下来的20秒期间无法再次添加设备");