From db937c029a3f9dbaec86cbbc944ebbee3ece13be Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 31 七月 2025 14:49:17 +0800 Subject: [PATCH] Merge branch '1.4.4' into dev --- app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 187 +++++++++++++++++++++++++++++----------------- 1 files changed, 118 insertions(+), 69 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 d5a58ef..e26b8aa 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 @@ -9,7 +9,6 @@ import android.os.Bundle; import android.provider.Settings; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; @@ -19,8 +18,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; @@ -32,9 +29,11 @@ import com.hdl.photovoltaic.databinding.FragmentHouseListBinding; import com.hdl.photovoltaic.base.CustomBaseFragment; import com.hdl.photovoltaic.enums.DebugStatus; +import com.hdl.photovoltaic.enums.DebugType; import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch; import com.hdl.photovoltaic.enums.LowerTagType; import com.hdl.photovoltaic.enums.PowerStationStatus; +import com.hdl.photovoltaic.enums.ProjectOperation; import com.hdl.photovoltaic.enums.ShowErrorMode; import com.hdl.photovoltaic.enums.SortType; import com.hdl.photovoltaic.enums.SortValue; @@ -57,9 +56,11 @@ import com.hdl.photovoltaic.utils.GPSManagerUtils; import com.hdl.photovoltaic.utils.PermissionUtils; import com.hdl.photovoltaic.utils.URLEncodingUtils; +import com.hdl.photovoltaic.widget.AddPowerStationDialog; import com.hdl.photovoltaic.widget.ConfirmationCancelDialog; import com.hdl.photovoltaic.widget.DefaultFilteringDialog; import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog; +import com.hdl.photovoltaic.widget.adapter.PowerStationDialogAdapter; import com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout; import com.hdl.photovoltaic.widget.refreshlayout.HDLRefreshViewHolder; import com.hdl.sdk.link.common.exception.HDLLinkException; @@ -222,12 +223,26 @@ viewBinding.addIv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - - requestPermissions(new OnCallBeak() { + AddPowerStationDialog addPowerStationDialog = new AddPowerStationDialog(_mActivity); + addPowerStationDialog.show(); + addPowerStationDialog.setCanceledOnTouchOutside(true); + addPowerStationDialog.setItemOnclickListener(new PowerStationDialogAdapter.OnclickListener() { @Override - public void onClickCallBeak() { -// UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1); -// HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); + public void onClick(int position, String str) { + addPowerStationDialog.dismiss(); + UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1); + if (_mActivity.getString(R.string.simple_debugging).equals(str)) { + HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION_SIMPLE, null); + } else { + HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); + } +// requestPermissions(new OnCallBeak() { +// @Override +// public void onClickCallBeak() { +//// UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1); +//// HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); +// } +// }); } }); @@ -304,49 +319,59 @@ @Override public void onDelClick(int position, HouseIdBean houseIdBean) { - + final boolean isWaitDelivered = houseIdBean.getDebugStatus().equals(DebugStatus.WAIT_DELIVERED); DelayedConfirmationCancelDialog delayedConfirmationCancelDialog = new DelayedConfirmationCancelDialog(_mActivity); delayedConfirmationCancelDialog.show(); delayedConfirmationCancelDialog.isHideTitle(true); String homeName = "\"" + houseIdBean.getHomeName() + "\""; - delayedConfirmationCancelDialog.setContent(getString(R.string.delete_power_station).replace("%s", homeName)); - - delayedConfirmationCancelDialog.startCountdown(4); + if (isWaitDelivered) { + //"鏄惁灏嗙數绔欑殑璋冭瘯鐘舵�佸洖閫�鍒拌皟璇曚腑" + delayedConfirmationCancelDialog.setContent(getString(R.string.debug_status_rollback).replace("%s", homeName)); + } else { + delayedConfirmationCancelDialog.startCountdown(4); + delayedConfirmationCancelDialog.setContent(getString(R.string.delete_power_station).replace("%s", homeName)); + } delayedConfirmationCancelDialog.setYesOnclickListener(new DelayedConfirmationCancelDialog.onYesOnclickListener() { @Override public void Confirm() { delayedConfirmationCancelDialog.dismiss(); - showLoading(getString(R.string.deleting_please_wait)); - HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() { - @Override - public void onSuccess(List<GatewayBean> list) { - //鍙戣捣鍒犻櫎鐢电珯鎸囦护 - deleteResidence(houseIdBean.getHomeId(), list); + if (isWaitDelivered) { + showLoading(); + HdlResidenceLogic.getInstance().setUpdateProjectDebugStatus(houseIdBean.getHomeId(), houseIdBean.getCommunityId(), houseIdBean.getFlowRecordContent(), ProjectOperation.DEBUGGING_AGAIN.toString(), new CloudCallBeak<Boolean>() { + @Override + public void onSuccess(Boolean list) { + hideLoading(); + if (houseInfoAdapter != null) { + houseIdBean.setDebugStatus(DebugStatus.Debugging); + HdlResidenceLogic.getInstance().updateHouseIdBean(houseIdBean); + initData(); + //鏇存柊UI + houseInfoAdapter.notifyItemChanged(position); + } + } - } + @Override + public void onFailure(HDLException e) { + hideLoading(); + } + }); + } else { + showLoading(getString(R.string.deleting_please_wait)); + HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() { + @Override + public void onSuccess(List<GatewayBean> list) { + //鍙戣捣鍒犻櫎鐢电珯鎸囦护 + deleteResidence(position, houseIdBean, list); - @Override - public void onFailure(HDLException e) { - //鍙戣捣鍒犻櫎鐢电珯鎸囦护 - deleteResidence(houseIdBean.getHomeId(), null); - } - }); + } -// //鍒犻櫎浣忓畢 -// HdlResidenceLogic.getInstance().delResidence(houseIdBean.getHomeId(), new CloudCallBeak<Boolean>() { -// @Override -// public void onSuccess(Boolean obj) { -// HdlResidenceLogic.getInstance().delHouseId(houseIdBean.getHomeId()); -// initData();//鍒濆鍖栫紦瀛樻暟鎹� -// houseInfoAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 -// nullDataUpdateUi(houseListBeanIDList);//妫�娴嬫暟鎹槸鍚︿负绌� -// } -// -// @Override -// public void onFailure(HDLException e) { -// HdlThreadLogic.toast(_mActivity, e); -// } -// }); + @Override + public void onFailure(HDLException e) { + //鍙戣捣鍒犻櫎鐢电珯鎸囦护 + deleteResidence(position, houseIdBean, null); + } + }); + } } }); delayedConfirmationCancelDialog.setNoOnclickListener(new DelayedConfirmationCancelDialog.onNoOnclickListener() { @@ -410,6 +435,10 @@ 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; + } // GatewayBean gatewayBean = new GatewayBean(); // gatewayBean.setCategorySecondName(deviceBean.getCategorySecondName()); // gatewayBean.setDevice_mac(deviceBean.getOsn()); @@ -445,7 +474,7 @@ } if (TextUtils.isEmpty(newGatewayBean.getGatewayId()) || TextUtils.isEmpty(newGatewayBean.getAesKey())) { //杩欓噷鍙敮鎸佽繙绋嬭皟璇曪紝杩滅▼鎷夸笉鍒癿qtt閫氳绉橀挜浠ュ強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)); @@ -525,7 +554,6 @@ viewBinding.fragmentHouseSrlListRc.setLayoutManager(new LinearLayoutManager(_mActivity)); viewBinding.fragmentHouseSrlListRc.setAdapter(houseInfoAdapter); houseInfoAdapter.setList(this.houseListBeanIDList, powerStationStatusValue); - //璁惧鏍囩 deviceInfoAdapter = new DeviceInfoAdapter(_mActivity); viewBinding.fragmentDeviceSrlListRc.setLayoutManager(new LinearLayoutManager(_mActivity)); @@ -592,15 +620,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); @@ -652,8 +683,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(); //瀛楃涓叉槸鑷繁鎸夎鍒欐嫾鎺ョ殑,閲岄潰娉ㄥ唽涓婚鏃朵細瑙f瀽瀛楃涓�,鍙嬁getGatewayId()鍊�; String topic = "/user/" + gatewayId + "/#"; //杩涘幓浣忓畢璇︽儏寮�濮嬭闃呬富棰� @@ -959,20 +990,26 @@ /** * 鍒犻櫎鐢电珯 * - * @param homeId 鐢电珯id - * @param list 閫嗗彉鍣ㄥ垪琛� + * @param position 浣嶇疆 + * @param houseIdBean 鐢电珯id瀵硅薄 + * @param list 閫嗗彉鍣ㄥ垪琛� */ - private void deleteResidence(String homeId, List<GatewayBean> list) { + private void deleteResidence(int position, HouseIdBean houseIdBean, List<GatewayBean> list) { //鍒犻櫎浣忓畢 - HdlResidenceLogic.getInstance().delResidence(homeId, new CloudCallBeak<Boolean>() { + HdlResidenceLogic.getInstance().delResidence(houseIdBean.getHomeId(), new CloudCallBeak<Boolean>() { @Override public void onSuccess(Boolean obj) { hideLoading(); - initializeInverter(list); //鍙戣捣鍒濆鍖栨寚浠ょ粰閫嗗彉鍣�;锛堟敞鎰�:鍙兘鏄湰鍦板彂閫佷簡(瑕佹悳绱㈠眬鍩熺綉閫嗗彉鍣ㄥ垪琛紝寤虹珛鏈湴閫氳閫氶亾),鍒犻櫎鐢电珯鎴愬姛鍚�,浜戠瑙g粦閫嗗彉鍣ㄧ殑鍏崇郴锛� - HdlResidenceLogic.getInstance().delHouseId(homeId);//鍒犻櫎鐢电珯缂撳瓨 + if (houseIdBean.getDebugType().equals(DebugType.NORMAL)) { + initializeInverter(list); //鍙戣捣鍒濆鍖栨寚浠ょ粰閫嗗彉鍣�;锛堟敞鎰�:鍓嶉潰宸插厛瑙g粦浜戠閫嗗彉鍣紝mqtt閫氶亾宸叉柇寮�锛屽垵濮嬪寲鍙兘鏄湰鍦板彂閫�(鍏堟悳绱㈠眬鍩熺綉閫嗗彉鍣ㄥ垪琛紝寤虹珛鏈湴閫氳閫氶亾)锛� + } + HdlResidenceLogic.getInstance().delHouseId(houseIdBean.getHomeId());//鍒犻櫎鐢电珯缂撳瓨 initData();//鍒濆鍖栫紦瀛樻暟鎹� - houseInfoAdapter.setList(houseListBeanIDList, powerStationStatusValue);//閲嶆柊鍒锋柊鍒楄〃 + if (houseInfoAdapter != null) { +// houseInfoAdapter.setList(houseListBeanIDList, powerStationStatusValue);//閲嶆柊鍒锋柊鍒楄〃 + houseInfoAdapter.notifyItemRemoved(position);//鍙埛鏂板綋鍓嶇殑浣嶇疆 + } getStatusOverview();//鍒犻櫎鎴愬姛鍚庡埛鏂扮數绔欑姸鎬佹瑙� nullDataUpdateUi();//妫�娴嬫暟鎹槸鍚︿负绌� } @@ -1013,18 +1050,30 @@ 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); } else { - - UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1); - HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); - locationUpdates(); - - + AddPowerStationDialog addPowerStationDialog = new AddPowerStationDialog(_mActivity); + addPowerStationDialog.show(); + addPowerStationDialog.setCanceledOnTouchOutside(true); + addPowerStationDialog.setItemOnclickListener(new PowerStationDialogAdapter.OnclickListener() { + @Override + public void onClick(int position, String str) { + addPowerStationDialog.dismiss(); +// UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage()); +// UserConfigManage.getInstance().Save(); + UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1); + if (_mActivity.getString(R.string.simple_debugging).equals(str)) { + HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION_SIMPLE, null); + } else { + HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); + } + locationUpdates(); + } + }); } } @@ -1192,4 +1241,4 @@ } -} +} \ No newline at end of file -- Gitblit v1.8.0