~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -1,16 +1,19 @@
			package com.hdl.photovoltaic.ui.powerstation;

			import android.Manifest;
			import android.app.Dialog;
			import android.content.Context;
			import android.content.DialogInterface;
			import android.content.Intent;
			import android.content.pm.PackageManager;
			import android.location.LocationManager;
			import android.os.AsyncTask;
			import android.os.Bundle;
			import android.os.SystemClock;
			import android.provider.Settings;
			import android.text.TextUtils;
			import android.util.Log;
			import android.view.View;
			import android.view.Window;
			import android.widget.ImageView;
			import android.widget.LinearLayout;
			import android.widget.RelativeLayout;
			@@ -19,8 +22,6 @@
			import androidx.annotation.NonNull;
			import androidx.appcompat.content.res.AppCompatResources;
			import androidx.recyclerview.widget.LinearLayoutManager;
			import androidx.recyclerview.widget.RecyclerView;
			import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

			import com.google.gson.Gson;
			import com.hdl.linkpm.sdk.core.exception.HDLException;
			@@ -45,6 +46,7 @@
			import com.hdl.photovoltaic.other.HdlDeviceLogic;
			import com.hdl.photovoltaic.other.HdlDialogLogic;
			import com.hdl.photovoltaic.other.HdlLogLogic;
			import com.hdl.photovoltaic.other.HdlOtaLogic;
			import com.hdl.photovoltaic.other.HdlResidenceLogic;
			import com.hdl.photovoltaic.other.HdlThreadLogic;
			import com.hdl.photovoltaic.other.HdlUniLogic;
			@@ -56,6 +58,7 @@
			import com.hdl.photovoltaic.uni.HDLUniMP;
			import com.hdl.photovoltaic.utils.GPSManagerUtils;
			import com.hdl.photovoltaic.utils.PermissionUtils;
			import com.hdl.photovoltaic.utils.ProcessManagerUtils;
			import com.hdl.photovoltaic.utils.URLEncodingUtils;
			import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
			import com.hdl.photovoltaic.widget.DefaultFilteringDialog;
			@@ -255,7 +258,6 @@
			installedCapacityMinValue = min;//最小组串容量(装机容量)
			installedCapacityMaxValue = max;//最大组串容量(装机容量)
			screeningConditionStatus = state;//调试状态(全部;调试中;调试完成;已交付;授权调试)
			getStatusOverview();
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
			}
			});
			@@ -358,7 +360,14 @@

			}
			});
			//PV筛选
			// //电站编辑按钮
			// viewBinding.editIv.setOnClickListener(new View.OnClickListener() {
			// @Override
			// public void onClick(View v) {
			// startActivity(HouseListEditActivity.class);
			// }
			// });
			//电站名称筛选
			viewBinding.stationNameRl.setOnClickListener(new View.OnClickListener() {
			@Override
			public void onClick(View v) {
			@@ -366,11 +375,10 @@
			screeningConditionStyle(viewBinding.stationNameRl, viewBinding.stationNameIv, isSelected);
			key = SortType.installedCapacitySort;
			value = isSelected ? SortValue.ascending : SortValue.descending;
			getStatusOverview();
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
			}
			});
			//额定功率筛选
			//电站发电功率筛选
			viewBinding.stationPowerRl.setOnClickListener(new View.OnClickListener() {
			@Override
			public void onClick(View v) {
			@@ -402,7 +410,17 @@
			screeningConditionStyle(viewBinding.stationDayRl, viewBinding.stationDayIv, isSelected);
			key = SortType.todayElectricitySort;
			value = isSelected ? SortValue.ascending : SortValue.descending;
			getStatusOverview();
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
			}
			});
			//电站电池容量筛选
			viewBinding.stationMonthRl.setOnClickListener(new View.OnClickListener() {
			@Override
			public void onClick(View v) {
			boolean isSelected = !v.isSelected();
			screenIconState(viewBinding.stationMonthRl, viewBinding.stationMonthIv, isSelected);
			key = SortType.batteryCapacitySort;
			value = isSelected ? SortValue.ascending : SortValue.descending;
			loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
			}
			});
			@@ -445,7 +463,7 @@
			}
			if (TextUtils.isEmpty(newGatewayBean.getGatewayId()) \|\| TextUtils.isEmpty(newGatewayBean.getAesKey())) {
			//这里只支持远程调试，远程拿不到mqtt通讯秘钥以及gatewayId；
			HdlThreadLogic.toast(_mActivity, getString(R.string.Device_failed_to_certificate) + "(124004)");
			HdlThreadLogic.toast(_mActivity, getString(R.string.device_failed_to_certificate) + "(124004)");
			return;
			}
			String jsonEncryption = URLEncodingUtils.encodeURIComponent(new Gson().toJson(newGatewayBean));
			@@ -640,7 +658,6 @@
			// if (MqttRecvClient.getInstance() != null) {
			// MqttRecvClient.getInstance().removeAllTopic();
			// }

			loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
			}
			} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST.equals(eventBus.getType())) {
			@@ -814,7 +831,7 @@
			if (isRefreshing) {
			hideLoading();
			}
			HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");

			}
			}, _mActivity, ShowErrorMode.YES);
			}
			@@ -883,7 +900,6 @@
			if (isRefreshing) {
			hideLoading();
			}
			HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
			}
			}, _mActivity, ShowErrorMode.YES);
			}
			@@ -972,7 +988,7 @@
			@Override
			public void onSuccess(Boolean obj) {
			hideLoading();
			initializeInverter(list); //发起初始化指令给逆变器;（注意:只能是本地发送了(要搜索局域网逆变器列表，建立本地通讯通道),删除电站成功后,云端解绑逆变器的关系）
			initializeInverter(list); //发起初始化指令给逆变器;（注意:前面已先解绑云端逆变器，mqtt通道已断开，初始化只能是本地发送(先搜索局域网逆变器列表，建立本地通讯通道)）
			HdlResidenceLogic.getInstance().delHouseId(homeId);//删除电站缓存
			initData();//初始化缓存数据
			houseInfoAdapter.setList(houseListBeanIDList, powerStationStatusValue);//重新刷新列表
			@@ -1016,8 +1032,8 @@

			public void requestPermissions(OnCallBeak onCallBeak) {

			//ACCESS_FINE_LOCATION 允许使用GPS定位
			//ACCESS_COARSE_LOCATION 允许使用WIFI热点或基站来获取粗略的定位
			//ACCESS_FINE_LOCATION 允许使用GPS定位
			//ACCESS_COARSE_LOCATION 允许使用WIFI热点或基站来获取粗略的定位
			String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION});
			if (ary.length > 0) {
			this.requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);