From 7acd65cb7c6b3fc1bda51f2d60884518df931c9b Mon Sep 17 00:00:00 2001
From: jia <jmessage@163.com>
Date: Tue, 24 Jun 2025 22:38:17 +0800
Subject: [PATCH] =?UTF-8?q?feat#415=5F=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties                             |  4 +--
 .../com/ifish/fragment/DeviceFragment.java    | 30 +++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 040ce8835..e8b661acd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,6 +25,6 @@ android.nonTransitiveRClass=true
 android.enableJetifier=true
 android.useAndroidX=true
 android.useDeprecatedNdk=true
-versionCode=109
-versionName=4.12.09
+versionCode=111
+versionName=4.12.11
 
diff --git a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
index afd823d1e..449b9c4c3 100644
--- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
+++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
@@ -274,16 +274,17 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
         dialog.show();
     }
 
-    private void getPermission() {
+    private void getPermission(boolean jump) {
         permissionHelper.request(new PermissionHelper.PermissionCallback() {
             @Override
             public void onPermissionGranted() {
 
-                Intent intent = new Intent();
-                intent.setClass(getActivity(), BindTwoDeviceActivity.class);
-                startActivity(intent);
-                AnimationUtil.startAnimation(getActivity());
-
+                if (jump){
+                    Intent intent = new Intent();
+                    intent.setClass(getActivity(), BindTwoDeviceActivity.class);
+                    startActivity(intent);
+                    AnimationUtil.startAnimation(getActivity());
+                }
             }
 
             @Override
@@ -317,7 +318,7 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
                     public void onClick(
                             DialogInterface dialog,
                             int which) {
-                        getPermission();
+                        getPermission(jump);
                     }
                 });
                 dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
@@ -1604,7 +1605,7 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
     private void addDevice(){
         if (ContextCompat.checkSelfPermission(requireActivity(), android.Manifest.permission.ACCESS_FINE_LOCATION)
                 != PackageManager.PERMISSION_GRANTED || BuildConfig.show) {
-            showPermissionHint();
+            showPermissionHint(true);
         }else {
             Intent intentx = new Intent();
             intentx.setClass(requireActivity(), BindTwoDeviceActivity.class);
@@ -1937,6 +1938,11 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
                 L.i("jjjia-----------蓝牙不可用---");
             }
         }else {
+            boolean first = SPUtil.getInstance(requireContext()).getBoolean("firstx",false);
+            if (!first){
+                showPermissionHint(false);
+                SPUtil.getInstance(requireContext()).putBoolean("firstx",false);
+            }
             L.i("jjjia-----------没有扫描权限---");
         }
     }
@@ -1952,16 +1958,16 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
     private int currentIndex = 0;
 
 
-    private void showPermissionHint(){
+    private void showPermissionHint(boolean jump){
 
-        IosAlertDialog openDialog = new IosAlertDialog(getContext()).builder();
+        IosAlertDialog openDialog = new IosAlertDialog(requireContext()).builder();
         openDialog.setCancelable(true);
         openDialog.setTitle("申请权限目的说明");
-        openDialog.setMessage("添加设备，需要先获取位置信息，才能获取附近wifi信息或智能设备，进行配网连接您的设备，是否允许申请位置权限和蓝牙权限？");
+        openDialog.setMessage(jump?"APP首次绑定设备需要访问位置权限和蓝牙使用权限，在稍后弹出的权限使用对话框中请点击确定，并打开手机蓝牙。":"添加设备，需要先获取位置信息，才能获取附近wifi信息或智能设备，进行配网连接您的设备，是否允许申请位置权限和蓝牙权限？");
         openDialog.setPositiveButton("继续", new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                getPermission();
+                getPermission(jump);
             }
         });
         openDialog.setNegativeButton("取消", new View.OnClickListener() {