blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wjc
2025-05-23 971a24a9e58a21bc306897fd3ad63012a399f7db 
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java


@@ -8,6 +8,7 @@


import android.os.AsyncTask;


import android.os.Bundle;


import android.provider.Settings;


import android.text.TextUtils;


import android.util.Log;


import android.view.View;


import android.widget.ImageView;


@@ -436,7 +437,17 @@


                HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, deviceBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {


                    @Override


                    public void onSuccess(List<GatewayBean> obj) {




                        GatewayBean newGatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(deviceBean.getOsn());


                        if (newGatewayBean == null) {


                            HdlThreadLogic.toast(_mActivity, getString(R.string.device_off));


                            return;


                        }


                        if (TextUtils.isEmpty(newGatewayBean.getGatewayId()) || TextUtils.isEmpty(newGatewayBean.getAesKey())) {


                            //这里只支持远程调试，远程拿不到mqtt通讯秘钥以及gatewayId；


                            HdlThreadLogic.toast(_mActivity, getString(R.string.Device_failed_to_certificate) + "(124004)");


                            return;


                        }


                        String jsonEncryption = URLEncodingUtils.encodeURIComponent(new Gson().toJson(newGatewayBean));


                        String path = HDLUniMP.UNI_EVENT_OPEN_DEVICE_DETAILS + "?inverterInfo=" + jsonEncryption;


                        HdlUniLogic.getInstance().openUniMP(path, null);


@@ -581,15 +592,18 @@


            if (HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION.equals(eventBus.getType())) {


                // 取消粘性事件


                EventBus.getDefault().removeStickyEvent(eventBus);


                //uin创建电站成功后通知


                loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);


                if (eventBus.getData() != null) {


                    Gson gson = new Gson();


                    String json = eventBus.getData().toString();


                    HouseIdBean houseIdBean = gson.fromJson(json, HouseIdBean.class);


                    HdlResidenceLogic.getInstance().switchHouse(houseIdBean, true);




                }


//                HdlLogLogic.print("进来了---11111" + eventBus.getData().toString());


//                //uin创建电站成功后通知


//                loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);


//                if (eventBus.getData() != null) {


//                    HdlLogLogic.print("进来了---" + eventBus.getData().toString());


//                    Gson gson = new Gson();


//                    String json = eventBus.getData().toString();


//                    HouseIdBean houseIdBean = gson.fromJson(json, HouseIdBean.class);


//                    HdlResidenceLogic.getInstance().switchHouse(houseIdBean, true);


//                    HdlLogLogic.print("进来了---结束" + eventBus.getData().toString());


//


//                }


            } else if (HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT.equals(eventBus.getType())) {


                // 取消粘性事件


                EventBus.getDefault().removeStickyEvent(eventBus);


@@ -641,8 +655,8 @@


            }


            String homeId = eventBus.getData().toString();


            //进去住宅详情uni读取逆变器列表成功后通知


            for (int i = 0; i < HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId, null).size(); i++) {


                String gatewayId = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId, null).get(i).getGatewayId();


            for (int i = 0; i < HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId).size(); i++) {


                String gatewayId = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId).get(i).getGatewayId();


                //字符串是自己按规则拼接的,里面注册主题时会解析字符串,只拿getGatewayId()值;


                String topic = "/user/" + gatewayId + "/#";


                //进去住宅详情开始订阅主题


@@ -1002,8 +1016,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);


@@ -1079,7 +1093,7 @@


                        // 执行任务（如更新UI、跳转等）


                        viewBinding.fragmentHouseSrl.endRefreshing();


                        //加载最新数据完成


                        loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);


                        loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);


                        getStatusOverview();


                    }


                }.execute();


@@ -1142,7 +1156,7 @@


                    @Override


                    protected void onPostExecute(Void aVoid) {


                        viewBinding.fragmentDeviceSrl.endRefreshing();


                        loadNextPageDeviceList(true, 1, true);


                        loadNextPageDeviceList(false, 1, true);


                    }


                }.execute();


            }


@@ -1181,4 +1195,4 @@


    }






}


}