From 3179371d3cb7e067937ae073c74a57bead023ba0 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期一, 25 八月 2025 10:26:54 +0800 Subject: [PATCH] 2025年08月25日10:26:52 --- app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java index 9138302..5e2d0cc 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java @@ -337,7 +337,8 @@ delayedConfirmationCancelDialog.dismiss(); if (isWaitDelivered) { showLoading(); - HdlResidenceLogic.getInstance().setUpdateProjectDebugStatus(houseIdBean.getHomeId(), houseIdBean.getCommunityId(), houseIdBean.getFlowRecordContent(), ProjectOperation.DEBUGGING_AGAIN.toString(), new CloudCallBeak<Boolean>() { + String flowRecordContent = UserConfigManage.getInstance().isZh() ? "鏂扮壒閿愯兘app鍙戣捣鐢电珯閲嶆柊璋冭瘯" : "The Xenterra app initiates the re-commissioning of the power station"; + HdlResidenceLogic.getInstance().setUpdateProjectDebugStatus(houseIdBean.getHomeId(), houseIdBean.getCommunityId(), flowRecordContent, ProjectOperation.DEBUGGING_AGAIN.toString(), new CloudCallBeak<Boolean>() { @Override public void onSuccess(Boolean list) { hideLoading(); @@ -435,10 +436,12 @@ deviceInfoAdapter.setOnclickListener(new DeviceInfoAdapter.OnClickListener() { @Override public void onClick(int position, CloudInverterDeviceBean deviceBean) { - if (!deviceBean.isActivate()) { - HdlThreadLogic.toast(_mActivity, getString(R.string.device_not_activated)); - return; - } + deviceBean.setActivate(true);//榛樿婵�娲� +// //鏉ㄦ稕璇磋繖涓垪琛ㄤ笉杩斿洖鏈縺娲荤殑璁惧锛屾墍浠ュ幓鎺夊垽鏂� +// if (!deviceBean.isActivate()) { +// HdlThreadLogic.toast(_mActivity, getString(R.string.device_not_activated)); +// return; +// } // GatewayBean gatewayBean = new GatewayBean(); // gatewayBean.setCategorySecondName(deviceBean.getCategorySecondName()); // gatewayBean.setDevice_mac(deviceBean.getOsn()); @@ -870,7 +873,7 @@ if (isRefreshing) { showLoading(getString(R.string.device_loading)); } - //鑾峰彇浣忓畢(鐢电珯)ID鍒楄〃 + //鑾峰彇璁惧鍒楄〃 HdlDeviceLogic.getInstance().getPowerStationDeviceList("", pageNo, pageSize, new CloudCallBeak<PageNumberObject<CloudInverterDeviceBean>>() { @Override public void onSuccess(PageNumberObject<CloudInverterDeviceBean> pageNumberObject) { @@ -1007,8 +1010,8 @@ HdlResidenceLogic.getInstance().delHouseId(houseIdBean.getHomeId());//鍒犻櫎鐢电珯缂撳瓨 initData();//鍒濆鍖栫紦瀛樻暟鎹� if (houseInfoAdapter != null) { -// houseInfoAdapter.setList(houseListBeanIDList, powerStationStatusValue);//閲嶆柊鍒锋柊鍒楄〃 - houseInfoAdapter.notifyItemRemoved(position);//鍙埛鏂板綋鍓嶇殑浣嶇疆 + houseInfoAdapter.setList(houseListBeanIDList, powerStationStatusValue);//閲嶆柊鍒锋柊鍒楄〃 +// houseInfoAdapter.notifyItemRemoved(position);//鍙埛鏂板綋鍓嶇殑浣嶇疆 } getStatusOverview();//鍒犻櫎鎴愬姛鍚庡埛鏂扮數绔欑姸鎬佹瑙� nullDataUpdateUi();//妫�娴嬫暟鎹槸鍚︿负绌� -- Gitblit v1.8.0