~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -2,10 +2,10 @@

			import android.Manifest;
			import android.content.Context;
			import android.content.Intent;
			import android.content.pm.PackageManager;
			import android.hardware.camera2.CameraManager;
			import android.os.Bundle;
			import android.util.Log;
			import android.view.View;

			import androidx.annotation.NonNull;
			@@ -13,12 +13,8 @@
			import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

			import com.google.gson.Gson;
			import com.google.gson.JsonObject;
			import com.hdl.linkpm.sdk.core.exception.HDLException;
			import com.hdl.photovoltaic.R;
			import com.hdl.photovoltaic.bean.BaseEventBus;
			import com.hdl.photovoltaic.config.ConstantManage;
			import com.hdl.photovoltaic.config.UserConfigManage;
			import com.hdl.photovoltaic.databinding.FragmentHouseListBinding;
			import com.hdl.photovoltaic.base.CustomBaseFragment;
			import com.hdl.photovoltaic.enums.ShowErrorMode;
			@@ -29,16 +25,18 @@
			import com.hdl.photovoltaic.other.HdlThreadLogic;
			import com.hdl.photovoltaic.other.HdlUniLogic;
			import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter;
			import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
			import com.hdl.photovoltaic.ui.bean.HouseIdBean;
			import com.hdl.photovoltaic.ui.device.FastScanActivity;
			import com.hdl.photovoltaic.uni.HDLUniMP;
			import com.hdl.photovoltaic.utils.PermissionUtils;
			import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
			import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;

			import java.util.ArrayList;
			import java.util.List;

			/**
			* 电站列表界面
			* (住宅)电站列表-界面
			*/
			public class HouseListFragment extends CustomBaseFragment {

			@@ -66,7 +64,6 @@
			@Override
			public void onBindView(Bundle savedInstanceState) {
			manager = (CameraManager) _mActivity.getSystemService(Context.CAMERA_SERVICE);

			initData();
			//初始化
			initView();
			@@ -78,16 +75,19 @@

			private void initEvent() {


			//添加电站
			viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setOnClickListener(new View.OnClickListener() {
			@Override
			public void onClick(View v) {

			// 打开小程序页面
			// HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
			requestPermissions(new PermissionsResultCallback() {
			@Override
			public void succeed() {
			// 打开小程序页面

			// Intent intent = new Intent();
			// intent.setClass(_mActivity, FastScanActivity.class);
			// startActivity(intent);
			// // 打开小程序页面
			HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
			}

			@@ -104,27 +104,28 @@
			@Override
			public void onRefresh() {
			updateUIData(true);
			Log.d("HouseListFragment", "下拉刷新");
			HdlLogLogic.print("HouseListFragment下拉刷新", false);
			}
			});
			houseInfoAdapter.setNoOnclickListener(new HouseInfoAdapter.OnclickListener() {
			@Override
			public void onClick(int position, HouseIdBean houseIdBean) {
			//点击住宅详情
			HdlLogLogic.print("====点击住宅详情" + position);
			HdlLogLogic.print("点击住宅详情===" + new Gson().toJson(houseIdBean), false);
			HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
			String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId();
			String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName();
			HdlUniLogic.getInstance().openUniMP(path, null);

			}
			});
			}

			private void initView() {
			viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.my_power_station_我的电站);
			viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.my_power_station);
			viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setVisibility(View.VISIBLE);
			viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setImageResource(R.drawable.add);
			LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
			houseInfoAdapter = new HouseInfoAdapter(this.houseListBeanIDList);
			houseInfoAdapter = new HouseInfoAdapter(this.houseListBeanIDList, _mActivity);
			viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout);
			viewBinding.fragmentHouseSrlListRc.setAdapter(houseInfoAdapter);

			@@ -141,17 +142,37 @@
			this.houseListBeanIDList.addAll(HdlResidenceLogic.getInstance().getHouseIdList());
			}

			/**
			* 收到EventBUs通知
			*
			* @param eventBus 数据
			*/
			@Override
			public void onEventMessage(BaseEventBus eventBus) {
			super.onEventMessage(eventBus);
			//收到EventBUs通知
			if (ConstantManage.EVENTBUS_POST_HOME_CREATED.equals(eventBus.getType())) {
			if (HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION.equals(eventBus.getType())) {
			//uin创建电站成功后通知
			updateUIData(false);
			if (eventBus.getData() != null) {
			Gson gson = new Gson();
			String json = gson.toJson(eventBus.getData());
			String json = eventBus.getData().toString();
			HouseIdBean houseIdBean = gson.fromJson(json, HouseIdBean.class);
			HdlResidenceLogic.getInstance().switchHouse(houseIdBean);

			}
			} else if (HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE.equals(eventBus.getType())) {
			//uin关闭住宅详情界面通知
			if (MqttRecvClient.getInstance() != null) {
			MqttRecvClient.getInstance().removeAllTopic();
			}
			} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST.equals(eventBus.getType())) {
			//进去住宅详情uni读取逆变器列表成功后通知
			for (int i = 0; i < HdlDeviceLogic.getInstance().getCurrentHomeGatewayList().size(); i++) {
			//String gatewayId = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList().get(i).getGatewayId();
			//字符串是自己按规则拼接的,里面注册主题时会解析字符串,只拿getGatewayId()值;
			//String topic = "/user/" + gatewayId+"/1";
			//进去住宅详情开始订阅主题
			MqttRecvClient.getInstance().checkAndsubscribeAllTopics("");
			}
			}
			}
			@@ -211,9 +232,10 @@


			mPermissionsResultCallback = permissionsResultCallback;
			//Manifest.permission.CAMERA,

			String[] s = new String[]{
			Manifest.permission.ACCESS_FINE_LOCATION,
			Manifest.permission.CAMERA,
			};
			String[] ary = PermissionUtils.checkPermission(_mActivity, s);
			if (ary.length > 0) {