From 4ef664125e88962903fb5d3f911f5015b652fc26 Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Tue, 19 May 2026 14:05:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C/=E7=99=BB=E5=BD=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83=20=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                     |  1 +
 app/src/main/java/com/ckkj/water/MyApplication.java  |  6 +++---
 .../com/ckkj/water/device/SelectWifiActivity.java    | 12 +++++++++++-
 .../java/com/ckkj/water/mine/MineCenterFragment.java |  8 ++++++++
 .../java/com/ckkj/water/mine/mvp/MinePresenter.java  |  4 +++-
 .../ckkj/water/permission/PermissionActivity.java    |  2 +-
 6 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0fcc852..3f2b678 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,6 +34,7 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
     <!--后台获取位置信息，若需后台定位则必选-->
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <!--用于申请调用A-GPS模块,卫星定位加速-->
diff --git a/app/src/main/java/com/ckkj/water/MyApplication.java b/app/src/main/java/com/ckkj/water/MyApplication.java
index 82e1a2a..ccad877 100644
--- a/app/src/main/java/com/ckkj/water/MyApplication.java
+++ b/app/src/main/java/com/ckkj/water/MyApplication.java
@@ -11,6 +11,7 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.google.gson.Gson;
 import com.ckkj.water.fate.util.LunarDateLoader;
 import com.ckkj.water.login.entity.LoginEntity;
@@ -79,9 +80,8 @@ public class MyApplication extends Application {
         //单位JSON
         String userInfoJson = SharePreUtil.getString(ConstantUtil.SHARE_PRE_NAME,context, ConstantUtil.USER_INFO_JSON_CONTENT);
         if(!TextUtils.isEmpty(userInfoJson)){
-            LoginEntity entity = new Gson().fromJson(userInfoJson, LoginEntity.class);
-            WaterUserInfoManager.getInstance().setEntity(entity);
-//            WaterUserInfoManager.getInstance().setUserInfo(entity.getUser_info());
+            MineUserInfoBean entity = new Gson().fromJson(userInfoJson, MineUserInfoBean.class);
+            WaterUserInfoManager.getInstance().setUserInfo(entity);
         }
         registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
             @Override
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 4b92e98..1db183a 100644
--- a/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
@@ -24,6 +24,7 @@ import com.ckkj.water.device.mvp.DeviceContract;
 import com.ckkj.water.device.mvp.DeviceImpl;
 import com.ckkj.water.device.mvp.DevicePresenter;
 import com.ckkj.water.network.BaseBean;
+import com.ckkj.water.permission.PermissionActivity;
 import com.ckkj.water.utils.manager.ThemeManager;
 import com.ckkj.water.utils.show.ToastUtil;
 import com.ckkj.water.utils.text.TextUtil;
@@ -121,7 +122,16 @@ public class SelectWifiActivity extends BaseActivity<DeviceResetWifiBinding, Dev
                 break;
 
             case R.id.tv_select_wifi:
-                scanWifi();
+                String[] permission = {
+                        Manifest.permission.BLUETOOTH_SCAN,
+                        Manifest.permission.ACCESS_FINE_LOCATION
+                };
+                boolean hasPermission = hasRecordPermission(permission);
+                if(!hasPermission){
+                    goTo(mContext, PermissionActivity.class,null);
+                }else{
+                    scanWifi();
+                }
                 break;
 
             case R.id.tv_next:
diff --git a/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java b/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java
index 6d8b715..6bcfc6f 100644
--- a/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java
+++ b/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java
@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.view.View;
 
 import com.ckkj.water.AppConfig;
+import com.ckkj.water.ConstantUtil;
 import com.ckkj.water.R;
 import com.ckkj.water.base.BaseFragment;
 import com.ckkj.water.base.entity.MineUserInfoBean;
@@ -17,8 +18,11 @@ import com.ckkj.water.mine.mvp.MineContract;
 import com.ckkj.water.mine.mvp.MineImpl;
 import com.ckkj.water.mine.mvp.MinePresenter;
 import com.ckkj.water.network.BaseBean;
+import com.ckkj.water.utils.dataUtil.SharePreUtil;
 import com.ckkj.water.utils.manager.ThemeManager;
+import com.ckkj.water.utils.manager.WaterUserInfoManager;
 import com.ckkj.water.utils.show.ToastUtil;
+import com.google.gson.Gson;
 import com.gyf.immersionbar.ImmersionBar;
 import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.interfaces.OnSelectListener;
@@ -106,6 +110,10 @@ public class MineCenterFragment extends BaseFragment<MineFragmentLayoutBinding,
      */
     @Override
     public void getUserInfoSuccess(MineUserInfoBean bean) {
+        Gson gson = new Gson();
+        String userInfoJson = gson.toJson(bean);
+        SharePreUtil.putString(ConstantUtil.SHARE_PRE_NAME,mContext,ConstantUtil.USER_INFO_JSON_CONTENT,userInfoJson);
+        WaterUserInfoManager.getInstance().setUserInfo(bean);
 
     }
 
diff --git a/app/src/main/java/com/ckkj/water/mine/mvp/MinePresenter.java b/app/src/main/java/com/ckkj/water/mine/mvp/MinePresenter.java
index 3863178..3bb4df6 100644
--- a/app/src/main/java/com/ckkj/water/mine/mvp/MinePresenter.java
+++ b/app/src/main/java/com/ckkj/water/mine/mvp/MinePresenter.java
@@ -2,10 +2,13 @@ package com.ckkj.water.mine.mvp;
 
 import android.text.TextUtils;
 
+import com.ckkj.water.ConstantUtil;
 import com.ckkj.water.base.BasePresenter;
 import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.ckkj.water.base.entity.UserInfoEntity;
+import com.ckkj.water.utils.dataUtil.SharePreUtil;
 import com.ckkj.water.utils.manager.WaterUserInfoManager;
+import com.google.gson.Gson;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,7 +36,6 @@ public class MinePresenter extends BasePresenter<MineContract.MineView> {
             @Override
             public void success(MineUserInfoBean bean) {
                 if(MinePresenter.this.getView() != null){
-                    WaterUserInfoManager.getInstance().setUserInfo(bean);
                     MinePresenter.this.getView().getUserInfoSuccess(bean);
                 }
             }
diff --git a/app/src/main/java/com/ckkj/water/permission/PermissionActivity.java b/app/src/main/java/com/ckkj/water/permission/PermissionActivity.java
index a0680fe..b0222ac 100644
--- a/app/src/main/java/com/ckkj/water/permission/PermissionActivity.java
+++ b/app/src/main/java/com/ckkj/water/permission/PermissionActivity.java
@@ -77,7 +77,7 @@ public class PermissionActivity extends BaseActivity<PermissionLayoutBinding, Ma
                 };
                 boolean hasPermission = hasRecordPermission(permission);
                 if(!hasPermission){
-                    getMorePermissionRequst(permission,"权限申请","智溉管家需要您的授权获取以下权限",REQUEST_EVENT_CODE_10001);
+                    getMorePermissionRequst(permission,"权限申请","智溉管家需要您的授权获取蓝牙和位置权限，用于添加设备",REQUEST_EVENT_CODE_10001);
                 }
                 break;
         }