注册/登录接口联调

个人信息接口联调

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模块,卫星定位加速-->

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);
+            MineUserInfoBean entity = new Gson().fromJson(userInfoJson, MineUserInfoBean.class);
-            WaterUserInfoManager.getInstance().setEntity(entity);
+            WaterUserInfoManager.getInstance().setUserInfo(entity);
-//            WaterUserInfoManager.getInstance().setUserInfo(entity.getUser_info());
         }
         registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
             @Override

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:

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);
 
     }
 

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);
                 }
             }

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;
         }